4 files changed, 28 insertions, 22 deletions

diff --git a/history.txt b/history.txt
index fc54386..fda02a3 100755
--- a/history.txt
+++ b/history.txt
@@ -2481,6 +2481,10 @@ ______
 ------
 * OOP: Prototypal inheritance of sprite-local variables
 
-150321
+150323
 ------
 * OOP: Objects, Blocks, Threads - tweaks
+
+150323
+------
+* OOP: Morphic, Objects, Store - tweak inherited variable watcher slider deserialization
diff --git a/morphic.js b/morphic.js
index 359e552..c725209 100644
--- a/morphic.js
+++ b/morphic.js
@@ -1048,7 +1048,7 @@
 /*global window, HTMLCanvasElement, getMinimumFontHeight, FileReader, Audio,
 FileList, getBlurredShadowSupport*/
 
-var morphicVersion = '2015-March-21';
+var morphicVersion = '2015-March-24';
 var modules = {}; // keep track of additional loaded modules
 var useBlurredShadows = getBlurredShadowSupport(); // check for Chrome-bug
 
@@ -5933,7 +5933,7 @@ SliderMorph.prototype.userSetStart = function (num) {
     this.start = Math.max(num, this.stop);
 };
 
-SliderMorph.prototype.setStart = function (num) {
+SliderMorph.prototype.setStart = function (num, noUpdate) {
     // for context menu demo purposes
     var newStart;
     if (typeof num === 'number') {
@@ -5951,12 +5951,12 @@ SliderMorph.prototype.setStart = function (num) {
         }
     }
     this.value = Math.max(this.value, this.start);
-    this.updateTarget();
+    if (!noUpdate) {this.updateTarget(); }
     this.drawNew();
     this.changed();
 };
 
-SliderMorph.prototype.setStop = function (num) {
+SliderMorph.prototype.setStop = function (num, noUpdate) {
     // for context menu demo purposes
     var newStop;
     if (typeof num === 'number') {
@@ -5968,12 +5968,12 @@ SliderMorph.prototype.setStop = function (num) {
         }
     }
     this.value = Math.min(this.value, this.stop);
-    this.updateTarget();
+    if (!noUpdate) {this.updateTarget(); }
     this.drawNew();
     this.changed();
 };
 
-SliderMorph.prototype.setSize = function (num) {
+SliderMorph.prototype.setSize = function (num, noUpdate) {
     // for context menu demo purposes
     var newSize;
     if (typeof num === 'number') {
@@ -5991,7 +5991,7 @@ SliderMorph.prototype.setSize = function (num) {
         }
     }
     this.value = Math.min(this.value, this.stop - this.size);
-    this.updateTarget();
+    if (!noUpdate) {this.updateTarget(); }
     this.drawNew();
     this.changed();
 };
diff --git a/objects.js b/objects.js
index 4ade0fa..66726a1 100644
--- a/objects.js
+++ b/objects.js
@@ -125,7 +125,7 @@ PrototypeHatBlockMorph*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.objects = '2015-March-23';
+modules.objects = '2015-March-24';
 
 var SpriteMorph;
 var StageMorph;
@@ -4224,8 +4224,10 @@ SpriteMorph.prototype.globalVariables = function () {
 SpriteMorph.prototype.shadowVar = function (name, value) {
     var ide = this.parentThatIsA(IDE_Morph);
     this.variables.addVar(name, value);
-    ide.flushBlocksCache('variables');
-    ide.refreshPalette();
+    if (ide) {
+        ide.flushBlocksCache('variables');
+        ide.refreshPalette();
+    }
 };
 
 SpriteMorph.prototype.inheritedVariableNames = function (shadowedOnly) {
@@ -7032,19 +7034,19 @@ WatcherMorph.prototype.isGlobal = function (selector) {
 
 // WatcherMorph slider accessing:
 
-WatcherMorph.prototype.setSliderMin = function (num) {
+WatcherMorph.prototype.setSliderMin = function (num, noUpdate) {
     if (this.target instanceof VariableFrame) {
-        this.sliderMorph.setSize(1);
-        this.sliderMorph.setStart(num);
-        this.sliderMorph.setSize(this.sliderMorph.rangeSize() / 5);
+        this.sliderMorph.setSize(1, noUpdate);
+        this.sliderMorph.setStart(num, noUpdate);
+        this.sliderMorph.setSize(this.sliderMorph.rangeSize() / 5, noUpdate);
     }
 };
 
-WatcherMorph.prototype.setSliderMax = function (num) {
+WatcherMorph.prototype.setSliderMax = function (num, noUpdate) {
     if (this.target instanceof VariableFrame) {
-        this.sliderMorph.setSize(1);
-        this.sliderMorph.setStop(num);
-        this.sliderMorph.setSize(this.sliderMorph.rangeSize() / 5);
+        this.sliderMorph.setSize(1, noUpdate);
+        this.sliderMorph.setStop(num, noUpdate);
+        this.sliderMorph.setSize(this.sliderMorph.rangeSize() / 5, noUpdate);
     }
 };
 
diff --git a/store.js b/store.js
index b2bb0a3..138dc24 100644
--- a/store.js
+++ b/store.js
@@ -61,7 +61,7 @@ SyntaxElementMorph, Variable*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.store = '2015-March-21';
+modules.store = '2015-March-24';
 
 
 // XML_Serializer ///////////////////////////////////////////////////////
@@ -540,8 +540,8 @@ SnapSerializer.prototype.rawLoadProjectModel = function (xmlNode) {
         }
         watcher.setStyle(model.attributes.style || 'normal');
         if (watcher.style === 'slider') {
-            watcher.setSliderMin(model.attributes.min || '1');
-            watcher.setSliderMax(model.attributes.max || '100');
+            watcher.setSliderMin(model.attributes.min || '1', true);
+            watcher.setSliderMax(model.attributes.max || '100', true);
         }
         watcher.setPosition(
             project.stage.topLeft().add(new Point(