resolve merge conflictissue_405

1 files changed, 13 insertions, 8 deletions

diff --git a/store.js b/store.js
index f8d46bf..7b2b7e1 100644
--- a/store.js
+++ b/store.js
@@ -57,11 +57,11 @@ newCanvas, Costume, Sound, Audio, IDE_Morph, ScriptsMorph, BlockMorph,
 ArgMorph, InputSlotMorph, TemplateSlotMorph, CommandSlotMorph,
 FunctionSlotMorph, MultiArgMorph, ColorSlotMorph, nop, CommentMorph, isNil,
 localize, sizeOf, ArgLabelMorph, SVG_Costume, MorphicPreferences,
-SyntaxElementMorph*/
+SyntaxElementMorph, Variable*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.store = '2014-July-29';
+modules.store = '2014-December-06';
 
 
 // XML_Serializer ///////////////////////////////////////////////////////
@@ -261,7 +261,9 @@ SnapSerializer.prototype.watcherLabels = {
     yPosition: 'y position',
     direction: 'direction',
     getScale: 'size',
+    getTempo: 'tempo',
     getLastAnswer: 'answer',
+    getLastMessage: 'message',
     getTimer: 'timer',
     getCostumeIdx: 'costume #',
     reportMouseX: 'mouse x',
@@ -730,8 +732,8 @@ SnapSerializer.prototype.loadVariables = function (varFrame, element) {
             return;
         }
         value = child.children[0];
-        varFrame.vars[child.attributes.name] = value ?
-                myself.loadValue(value) : 0;
+        varFrame.vars[child.attributes.name] = new Variable(value ?
+                myself.loadValue(value) : 0);
     });
 };
 
@@ -1199,6 +1201,10 @@ SnapSerializer.prototype.loadValue = function (model) {
         if (el) {
             v.outerContext = this.loadValue(el);
         }
+        if (v.outerContext && v.receiver &&
+                !v.outerContext.variables.parentFrame) {
+            v.outerContext.variables.parentFrame = v.receiver.variables;
+        }
         return v;
     case 'costume':
         center = new Point();
@@ -1393,7 +1399,7 @@ StageMorph.prototype.toXML = function (serializer) {
             '<blocks>%</blocks>' +
             '<variables>%</variables>' +
             '</project>',
-        (ide && ide.projectName) ? ide.projectName : 'Untitled',
+        (ide && ide.projectName) ? ide.projectName : localize('Untitled'),
         serializer.app,
         serializer.version,
         (ide && ide.projectNotes) ? ide.projectNotes : '',
@@ -1509,7 +1515,7 @@ Sound.prototype.toXML = function (serializer) {
 VariableFrame.prototype.toXML = function (serializer) {
     var myself = this;
     return Object.keys(this.vars).reduce(function (vars, v) {
-        var val = myself.vars[v],
+        var val = myself.vars[v].value,
             dta;
         if (val === undefined || val === null) {
             dta = serializer.format('<variable name="@"/>', v);
@@ -1824,9 +1830,8 @@ Context.prototype.toXML = function (serializer) {
         return '';
     }
     return serializer.format(
-        '<context% ~><inputs>%</inputs><variables>%</variables>' +
+        '<context ~><inputs>%</inputs><variables>%</variables>' +
             '%<receiver>%</receiver>%</context>',
-        this.isLambda ? ' lambda="lambda"' : '',
         this.inputs.reduce(
                 function (xml, input) {
                     return xml + serializer.format('<input>$</input>', input);