aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-20 16:43:31 -0700
committerValerio Virgillito2012-04-20 16:43:31 -0700
commit3dfd75a1d7948ef369188e1ca23c0f044c0d17a1 (patch)
treeaee69cb8561a9745d2e92e76b7a6f690c8e12b7b
parentc62273126004f057de40ce91ecda5606643f4c92 (diff)
downloadninja-3dfd75a1d7948ef369188e1ca23c0f044c0d17a1.tar.gz
more backup fixes for the old stage
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
-rwxr-xr-xjs/panels/properties.reel/properties.js1
-rwxr-xr-xjs/stage/stage.reel/stage.js2
2 files changed, 1 insertions, 2 deletions
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index f57982b6..d9dca538 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -187,7 +187,6 @@ exports.Properties = Montage.create(Component, {
187 187
188 displayStageProperties: { 188 displayStageProperties: {
189 value: function() { 189 value: function() {
190
191 var stage = this.application.ninja.currentDocument.documentRoot; 190 var stage = this.application.ninja.currentDocument.documentRoot;
192 //this is test code please remove 191 //this is test code please remove
193 this.elementName.value = "Stage"; 192 this.elementName.value = "Stage";
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 567bc333..ec8c0e55 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -252,7 +252,7 @@ exports.Stage = Montage.create(Component, {
252 this.application.ninja.currentDocument.savedLeftScroll = this._iframeContainer.scrollLeft; 252 this.application.ninja.currentDocument.savedLeftScroll = this._iframeContainer.scrollLeft;
253 this.application.ninja.currentDocument.savedTopScroll = this._iframeContainer.scrollTop; 253 this.application.ninja.currentDocument.savedTopScroll = this._iframeContainer.scrollTop;
254 254
255 this.userContentBorder = 0;//parseInt(this._documentRoot.elementModel.controller.getProperty(this._documentRoot, "border")); 255 this.userContentBorder = parseInt(this._documentRoot.elementModel.controller.getProperty(this._documentRoot, "border"));
256 256
257 this._userContentLeft = this._documentOffsetLeft - this._scrollLeft + this._userContentBorder; 257 this._userContentLeft = this._documentOffsetLeft - this._scrollLeft + this._userContentBorder;
258 this._userContentTop = this._documentOffsetTop - this._scrollTop + this._userContentBorder; 258 this._userContentTop = this._documentOffsetTop - this._scrollTop + this._userContentBorder;