Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document

author: Jose Antonio Marquez 2012-05-07 10:38:04 -0700
committer: Jose Antonio Marquez 2012-05-07 10:38:04 -0700
commit: 5293ede5f3493900df93da33197416d853f8d907 (patch)
tree: 3155deaea5616fa09fc96c84567419fec5f288a2 /js/stage
parent: 9c0bda09a502472768f6dd5090a882d11be58d23 (diff)
parent: 30e837ade2da7cb20caf7c5a69faf0888736bb9a (diff)
download: ninja-5293ede5f3493900df93da33197416d853f8d907.tar.gz
3 files changed, 17 insertions, 10 deletions
diff --git a/js/stage/layout.js b/js/stage/layout.js
index 0a76dbe5..9c5e2167 100755
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
@@ -156,7 +156,7 @@ exports.Layout = Montage.create(Component, {
    drawTagOutline: {
        value: function (item) {
-            if(!item || (item.nodeType !== 1)) return;
+            if(!item || !this.application.ninja.selectionController.isNodeTraversable(item)) return;
            // TODO Bind the layoutview mode to the current document
            // var mode  = this.application.ninja.currentDocument.layoutMode;
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index 12a331c3..30c3d231 100755
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -79,13 +79,13 @@
 </head>
 <body>
-    <section id="stageAndScenesContainer" class="stageAndScenesContainer">
+    <section data-montage-id="stageAndScenesContainer" class="stageAndScenesContainer">
-        <section id="stageView"></section>
+        <section data-montage-id="stageView"></section>
-        <section id="iframeContainer"></section>
+        <section data-montage-id="iframeContainer" id="iframeContainer"></section>
-        <section id="textToolObject"></section>
+        <section data-montage-id="textToolObject"></section>
-        <canvas id="layoutCanvas"></canvas>
+        <canvas data-montage-id="layoutCanvas" class="layoutCanvas"></canvas>
-        <canvas id="stageCanvas"></canvas>
+        <canvas data-montage-id="stageCanvas" class="stageCanvas"></canvas>
-        <canvas id="drawingCanvas"></canvas>
+        <canvas data-montage-id="drawingCanvas" class="drawingCanvas"></canvas>
    </section>
 </body>
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 2e49fc04..171c4f36 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -855,6 +855,12 @@ exports.Stage = Montage.create(Component, {
        }
    },
+    setStageAsViewport: {
+        value: function() {
+            this.stageDeps.viewUtils.setViewportObj(this.application.ninja.currentDocument.documentRoot);
+        }
+    },
    setZoom: {
        value: function(value) {
            if(!this._firstDraw)
@@ -958,8 +964,9 @@ exports.Stage = Montage.create(Component, {
           this.application.ninja.documentController.activeDocument.savedLeftScroll = this._iframeContainer.scrollLeft;
           this.application.ninja.documentController.activeDocument.savedTopScroll = this._iframeContainer.scrollTop;
       }
-   },
+    },
-   restoreScroll:{
+    restoreScroll:{
       value: function(){
           this._iframeContainer.scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll;
           this._scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll;
author	Jose Antonio Marquez	2012-05-07 10:38:04 -0700
committer	Jose Antonio Marquez	2012-05-07 10:38:04 -0700
commit	5293ede5f3493900df93da33197416d853f8d907 (patch)
tree	3155deaea5616fa09fc96c84567419fec5f288a2 /js/stage
parent	9c0bda09a502472768f6dd5090a882d11be58d23 (diff)
parent	30e837ade2da7cb20caf7c5a69faf0888736bb9a (diff)
download	ninja-5293ede5f3493900df93da33197416d853f8d907.tar.gz

diff --git a/js/stage/layout.js b/js/stage/layout.js index 0a76dbe5..9c5e2167 100755 --- a/js/stage/layout.js +++ b/js/stage/layout.js
@@ -156,7 +156,7 @@ exports.Layout = Montage.create(Component, {
156	drawTagOutline: {	156	drawTagOutline: {
157	value: function (item) {	157	value: function (item) {
158		158
159	if(!item \|\| (item.nodeType !== 1)) return;	159	if(!item \|\| !this.application.ninja.selectionController.isNodeTraversable(item)) return;
160		160
161	// TODO Bind the layoutview mode to the current document	161	// TODO Bind the layoutview mode to the current document
162	// var mode = this.application.ninja.currentDocument.layoutMode;	162	// var mode = this.application.ninja.currentDocument.layoutMode;


diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html index 12a331c3..30c3d231 100755 --- a/js/stage/stage.reel/stage.html +++ b/js/stage/stage.reel/stage.html
@@ -79,13 +79,13 @@
79	</head>	79	</head>
80	<body>	80	<body>
81		81
82	<section id="stageAndScenesContainer" class="stageAndScenesContainer">	82	<section data-montage-id="stageAndScenesContainer" class="stageAndScenesContainer">
83	<section id="stageView"></section>	83	<section data-montage-id="stageView"></section>
84	<section id="iframeContainer"></section>	84	<section data-montage-id="iframeContainer" id="iframeContainer"></section>
85	<section id="textToolObject"></section>	85	<section data-montage-id="textToolObject"></section>
86	<canvas id="layoutCanvas"></canvas>	86	<canvas data-montage-id="layoutCanvas" class="layoutCanvas"></canvas>
87	<canvas id="stageCanvas"></canvas>	87	<canvas data-montage-id="stageCanvas" class="stageCanvas"></canvas>
88	<canvas id="drawingCanvas"></canvas>	88	<canvas data-montage-id="drawingCanvas" class="drawingCanvas"></canvas>
89	</section>	89	</section>
90		90
91	</body>	91	</body>


diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 2e49fc04..171c4f36 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js
@@ -855,6 +855,12 @@ exports.Stage = Montage.create(Component, {
855	}	855	}
856	},	856	},
857		857
		858	setStageAsViewport: {
		859	value: function() {
		860	this.stageDeps.viewUtils.setViewportObj(this.application.ninja.currentDocument.documentRoot);
		861	}
		862	},
		863
858	setZoom: {	864	setZoom: {
859	value: function(value) {	865	value: function(value) {
860	if(!this._firstDraw)	866	if(!this._firstDraw)
@@ -958,8 +964,9 @@ exports.Stage = Montage.create(Component, {
958	this.application.ninja.documentController.activeDocument.savedLeftScroll = this._iframeContainer.scrollLeft;	964	this.application.ninja.documentController.activeDocument.savedLeftScroll = this._iframeContainer.scrollLeft;
959	this.application.ninja.documentController.activeDocument.savedTopScroll = this._iframeContainer.scrollTop;	965	this.application.ninja.documentController.activeDocument.savedTopScroll = this._iframeContainer.scrollTop;
960	}	966	}
961	},	967	},
962	restoreScroll:{	968
		969	restoreScroll:{
963	value: function(){	970	value: function(){
964	this._iframeContainer.scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll;	971	this._iframeContainer.scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll;
965	this._scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll;	972	this._scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll;