Merge branch 'xml_beautifier' into github_backend

8 files changed, 21 insertions, 9 deletions

diff --git a/.gitmodules b/.gitmodules
index 24bc92d..417778f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "octokit.js"]
 	path = octokit.js
 	url = https://github.com/philschatz/octokit.js
+[submodule "vkBeautify"]
+	path = vkBeautify
+	url = https://github.com/vkiryukhin/vkBeautify
diff --git a/blocks.js b/blocks.js
index 2e297ab..5f9bb29 100644
--- a/blocks.js
+++ b/blocks.js
@@ -155,7 +155,7 @@ DialogBoxMorph, BlockInputFragmentMorph, PrototypeHatBlockMorph, Costume*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.blocks = '2014-July-30';
+modules.blocks = '2014-August-13';
 
 
 var SyntaxElementMorph;
@@ -396,10 +396,11 @@ SyntaxElementMorph.prototype.allInputs = function () {
 SyntaxElementMorph.prototype.allEmptySlots = function () {
 /*
     answer empty input slots of all children excluding myself,
-    but omit those in nested rings (lambdas)
+    but omit those in nested rings (lambdas) and JS-Function primitives
 */
     var empty = [];
-    if (!(this instanceof RingMorph)) {
+    if (!(this instanceof RingMorph) &&
+            (this.selector !== 'reportJSFunction')) {
         this.children.forEach(function (morph) {
             if (morph.isEmptySlot && morph.isEmptySlot()) {
                 empty.push(morph);
diff --git a/history.txt b/history.txt
index 0a7dfe6..d18452e 100755
--- a/history.txt
+++ b/history.txt
@@ -2256,3 +2256,9 @@ ______
 * Objects: propagate HIDE and SHOW to nested sprite parts
 * GUI: propagate DELETE to nested sprite parts
 * Blocks, Threads: export script pic with result bubble (shift-context-menu of reporter scripts)
+* updated Portuguese translation, thanks, Manuel!
+
+140813
+------
+* Threads, Blocks: enable Zombiefication of JS-Functions
+* Morphic: Fix #563 (Paste into Chrome), thanks, @Muon, for the hint!
diff --git a/morphic.js b/morphic.js
index 2bbdd4e..2a242f2 100644
--- a/morphic.js
+++ b/morphic.js
@@ -1035,7 +1035,7 @@
 /*global window, HTMLCanvasElement, getMinimumFontHeight, FileReader, Audio,
 FileList, getBlurredShadowSupport*/
 
-var morphicVersion = '2014-July-29';
+var morphicVersion = '2014-August-13';
 var modules = {}; // keep track of additional loaded modules
 var useBlurredShadows = getBlurredShadowSupport(); // check for Chrome-bug
 
@@ -10321,7 +10321,8 @@ WorldMorph.prototype.initEventListeners = function () {
                 }
                 event.preventDefault();
             }
-            if (event.ctrlKey || event.metaKey) {
+            if ((event.ctrlKey || event.metaKey) &&
+                    (event.keyIdentifier !== 'U+0056')) { // allow pasting-in
                 event.preventDefault();
             }
         },
diff --git a/snap.html b/snap.html
index c716efa..733b571 100755
--- a/snap.html
+++ b/snap.html
@@ -21,6 +21,7 @@
                 <script type="text/javascript" src="octokit.js/octokit.js"></script>
                 <script type="text/javascript" src="github.js"></script>
 		<script type="text/javascript" src="sha512.js"></script>
+                <script type="text/javascript" src="vkBeautify/vkbeautify.js"></script>
 		<script type="text/javascript">
 			var world;
 			window.onload = function () {
diff --git a/store.js b/store.js
index f8d46bf..56ead6c 100644
--- a/store.js
+++ b/store.js
@@ -97,7 +97,7 @@ XML_Serializer.prototype.serialize = function (object) {
     this.flushMedia();
     xml = this.store(object);
     this.flush();
-    return xml;
+    return vkbeautify.xml(xml);
 };
 
 XML_Serializer.prototype.store = function (object, mediaID) {
@@ -135,7 +135,7 @@ XML_Serializer.prototype.mediaXML = function () {
         );
         xml = xml + str;
     });
-    return xml + '</media>';
+    return vkbeautify.xml(xml + '</media>');
 };
 
 XML_Serializer.prototype.add = function (object) {
diff --git a/threads.js b/threads.js
index 3324ac6..335b5d0 100644
--- a/threads.js
+++ b/threads.js
@@ -83,7 +83,7 @@ ArgLabelMorph, localize, XML_Element, hex_sha512*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.threads = '2014-July-30';
+modules.threads = '2014-August-13';
 
 var ThreadManager;
 var Process;
@@ -774,7 +774,7 @@ Process.prototype.evaluate = function (
     if (!context) {return null; }
     if (context instanceof Function) {
         return context.apply(
-            this.homeContext.receiver,
+            this.blockReceiver(),
             args.asArray().concat([this])
         );
     }
diff --git a/vkBeautify b/vkBeautify
new file mode 160000
+Subproject ecfc3b9e2b911ad8ebd49600c4089aca30619f2