Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html Signed-off-by: Jonathan Duran <jduran@motorola.com>
author: Jonathan Duran 2012-05-09 09:58:27 -0700
committer: Jonathan Duran 2012-05-09 09:58:27 -0700
commit: 48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch)
tree: 899f9cf1b09a01bc073f92ab498236aed80b38ec /js/stage
parent: 2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff)
parent: d220c02e246b30509b28a47fa04916ca2b8122e4 (diff)
download: ninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz
3 files changed, 26 insertions, 28 deletions
diff --git a/js/stage/stage-view.reel/stage-view.css b/js/stage/stage-view.reel/stage-view.css
index e2c4bb0e..8afb52a2 100755
--- a/js/stage/stage-view.reel/stage-view.css
+++ b/js/stage/stage-view.reel/stage-view.css
@@ -17,29 +17,20 @@
  cursor:text;
 }
-.codeViewContainer>div{
+.codeViewContainer .CodeMirror {
-    width:2500px;/*to prevent scrolling of editor container in the middle of the page for short files*/
+    width: 100%;
+    height: 100%;
+    background: white;
 }
-/* OLD CSS for reference
+.codeViewContainer .CodeMirror-scroll {
-#mainContent #codeMirror_1 {
+    height: 100%;
-    height:100%;
+    overflow: auto;
 }
-*/
-/*.CodeMirror {*/
-    /*width: 100%;*/
-    /*height: 100%;*/
-    /*background: white;*/
-/*}*/
-/*.CodeMirror .CodeMirror-scroll {*/
-    /*height: 100%;*/
-    /*overflow: scroll;*/
-    /*overflow-x: auto;*/
-    /*overflow-y: auto;*/
-/*}*/
+.codeViewContainer>div{
+    width:2500px;/*to prevent scrolling of editor container in the middle of the page for short files*/
+}
 span.CodeMirror-matchhighlight { background: #e9e9e9 }
 .CodeMirror-focused span.CodeMirror-matchhighlight { background: #e7e4ff; !important }
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 515165bf..b181dc70 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	Jonathan Duran	2012-05-09 09:58:27 -0700
committer	Jonathan Duran	2012-05-09 09:58:27 -0700
commit	48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch)
tree	899f9cf1b09a01bc073f92ab498236aed80b38ec /js/stage
parent	2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff)
parent	d220c02e246b30509b28a47fa04916ca2b8122e4 (diff)
download	ninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz

diff --git a/js/stage/stage-view.reel/stage-view.css b/js/stage/stage-view.reel/stage-view.css index e2c4bb0e..8afb52a2 100755 --- a/js/stage/stage-view.reel/stage-view.css +++ b/js/stage/stage-view.reel/stage-view.css
@@ -17,29 +17,20 @@
17	cursor:text;	17	cursor:text;
18	}	18	}
19		19
20	.codeViewContainer>div{	20	.codeViewContainer .CodeMirror {
21	width:2500px;/to prevent scrolling of editor container in the middle of the page for short files/	21	width: 100%;
		22	height: 100%;
		23	background: white;
22	}	24	}
23		25
24	/* OLD CSS for reference	26	.codeViewContainer .CodeMirror-scroll {
25	#mainContent #codeMirror_1 {	27	height: 100%;
26	height:100%;	28	overflow: auto;
27	}	29	}
28	*/
29
30	/.CodeMirror {/
31	/width: 100%;/
32	/height: 100%;/
33	/background: white;/
34	/}/
35
36	/.CodeMirror .CodeMirror-scroll {/
37	/height: 100%;/
38	/overflow: scroll;/
39	/overflow-x: auto;/
40	/overflow-y: auto;/
41	/}/
42		30
		31	.codeViewContainer>div{
		32	width:2500px;/to prevent scrolling of editor container in the middle of the page for short files/
		33	}
43		34
44	span.CodeMirror-matchhighlight { background: #e9e9e9 }	35	span.CodeMirror-matchhighlight { background: #e9e9e9 }
45	.CodeMirror-focused span.CodeMirror-matchhighlight { background: #e7e4ff; !important }	36	.CodeMirror-focused span.CodeMirror-matchhighlight { background: #e7e4ff; !important }


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 515165bf..b181dc70 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;