From 3a754133dbc138390503341fd2e9beba3e43aa4b Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Fri, 27 Jan 2012 12:05:17 -0800 Subject: Merged old FileIO --- js/stage/stage.reel/stage.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 js/stage/stage.reel/stage.js (limited to 'js/stage/stage.reel/stage.js') diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js old mode 100644 new mode 100755 -- cgit v1.2.3 From 729bc48212d7244539c99ca206be673eed011115 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Mon, 6 Feb 2012 16:07:46 -0800 Subject: integrated save for the document tabs, detect codemirror history to show document dirty indicator. Signed-off-by: Ananya Sen --- js/stage/stage.reel/stage.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'js/stage/stage.reel/stage.js') diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 9e2df5a2..4364b45d 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js @@ -876,5 +876,20 @@ exports.Stage = Montage.create(Component, { this.stageDeps.snapManager.updateWorkingPlaneFromView(); } + }, + + saveStageScroll:{ + value: function(){ + this.savedLeftScroll = this._iframeContainer.scrollLeft; + this.savedTopScroll = this._iframeContainer.scrollTop; + } + }, + applySavedScroll:{ + value: function(){ + this._iframeContainer.scrollLeft = this.savedLeftScroll; + this._scrollLeft = this.savedLeftScroll; + this._iframeContainer.scrollTop = this.savedTopScroll; + this._scrollTop = this.savedTopScroll; + } } }); \ No newline at end of file -- cgit v1.2.3 From 5f506542d28e12b707c3bfa41b53383519838477 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Tue, 7 Feb 2012 16:50:27 -0800 Subject: Revert "Initial Text Tool Implementation" This reverts commit 2082fa6912eec2ffabd2081b7706e8e1b88a9711. --- js/stage/stage.reel/stage.js | 7 ------- 1 file changed, 7 deletions(-) (limited to 'js/stage/stage.reel/stage.js') diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 96bfccdd..3e0b852e 100644 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js @@ -12,7 +12,6 @@ var vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils; exports.Stage = Montage.create(Component, { - textTool: { value: null }, // TODO - Need to figure out how to remove this dependency // Needed by some tools that depend on selectionDrawn event to set up some logic drawNow: { value : false }, @@ -781,12 +780,6 @@ exports.Stage = Montage.create(Component, { } }, - toViewportCoordinates: { - value: function(x,y) { - return [x + this._userContentLeft, y + this._userContentTop]; - } - }, - setZoom: { value: function(value) { if(!this._firstDraw) -- cgit v1.2.3 From 36b2e540f06cef3887e7d0fea60527fee51e2a40 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Wed, 8 Feb 2012 15:36:53 -0800 Subject: fixed undo/redo for each code view document, changed new file integration with io mediator Signed-off-by: Ananya Sen --- js/stage/stage.reel/stage.js | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'js/stage/stage.reel/stage.js') diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 4364b45d..8c0f0fa0 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js @@ -116,9 +116,6 @@ exports.Stage = Montage.create(Component, { _userContentLeft: { value: 0 }, _userContentTop: { value: 0 }, _userContentBorder: { value: 0 }, - savedLeftScroll: { value: null }, - savedTopScroll: { value: null }, - documentRoot: { get: function () { return this._documentRoot; }, @@ -247,6 +244,8 @@ exports.Stage = Montage.create(Component, { this._scrollLeft = this._iframeContainer.scrollLeft; this._scrollTop = this._iframeContainer.scrollTop; + this.application.ninja.currentDocument.savedLeftScroll = this._iframeContainer.scrollLeft; + this.application.ninja.currentDocument.savedTopScroll = this._iframeContainer.scrollTop; this.userContentBorder = parseInt(this._documentRoot.elementModel.controller.getProperty(this._documentRoot, "border")); @@ -878,18 +877,18 @@ exports.Stage = Montage.create(Component, { } }, - saveStageScroll:{ - value: function(){ - this.savedLeftScroll = this._iframeContainer.scrollLeft; - this.savedTopScroll = this._iframeContainer.scrollTop; - } - }, - applySavedScroll:{ - value: function(){ - this._iframeContainer.scrollLeft = this.savedLeftScroll; - this._scrollLeft = this.savedLeftScroll; - this._iframeContainer.scrollTop = this.savedTopScroll; - this._scrollTop = this.savedTopScroll; - } - } + saveScroll:{ + value: function(){ + this.application.ninja.documentController.activeDocument.savedLeftScroll = this._iframeContainer.scrollLeft; + this.application.ninja.documentController.activeDocument.savedTopScroll = this._iframeContainer.scrollTop; + } + }, + restoreScroll:{ + value: function(){ + this._iframeContainer.scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll; + this._scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll; + this._iframeContainer.scrollTop = this.application.ninja.documentController.activeDocument.savedTopScroll; + this._scrollTop = this.application.ninja.documentController.activeDocument.savedTopScroll; + } + } }); \ No newline at end of file -- cgit v1.2.3 From f979f47658a03640cc81e729e3cf88d80f8ec366 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Mon, 13 Feb 2012 13:44:37 -0800 Subject: appended function : toViewportCoordinates in stage Signed-off-by: Armen Kesablyan --- js/stage/stage.reel/stage.js | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'js/stage/stage.reel/stage.js') diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 9e2df5a2..77cd1936 100644 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js @@ -780,6 +780,12 @@ exports.Stage = Montage.create(Component, { } }, + toViewportCoordinates: { + value: function(x,y) { + return [x + this._userContentLeft, y + this._userContentTop]; + } + }, + setZoom: { value: function(value) { if(!this._firstDraw) -- cgit v1.2.3 From 33bc9d62b8e6694500bf14d5b18187bd99a520a3 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Tue, 14 Feb 2012 10:44:21 -0800 Subject: Cleaning up requires --- js/stage/stage.reel/stage.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'js/stage/stage.reel/stage.js') diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 852f480d..89b2d475 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js @@ -4,11 +4,10 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. */ -var Montage = require("montage/core/core").Montage, - Component = require("montage/ui/component").Component; - -var drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils; -var vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils; +var Montage = require("montage/core/core").Montage, + Component = require("montage/ui/component").Component, + drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils, + vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils; exports.Stage = Montage.create(Component, { -- cgit v1.2.3