Merge branch 'FileIO' of https://github.com/joseeight/ninja-internal into integration

author: Valerio Virgillito 2012-02-14 11:07:21 -0800
committer: Valerio Virgillito 2012-02-14 11:07:21 -0800
commit: f060190a3bffd9a16718f2ce0499699103d46372 (patch)
tree: a308fe7eacec2156c8212dff0892a3de925d5f9a /js/stage/stage.reel
parent: f766cc203f30ea43ae8b83cf4b65d45cc4435ee9 (diff)
parent: 33bc9d62b8e6694500bf14d5b18187bd99a520a3 (diff)
download: ninja-f060190a3bffd9a16718f2ce0499699103d46372.tar.gz
3 files changed, 32 insertions, 11 deletions
diff --git a/js/stage/stage.reel/stage.css b/js/stage/stage.reel/stage.css
index 54b9761b..54b9761b 100644..100755
--- a/js/stage/stage.reel/stage.css
+++ b/js/stage/stage.reel/stage.css
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index 623c54b8..9ed0f636 100644..100755
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -11,6 +11,14 @@
    <script type="text/montage-serialization">
        {
+            "stageView" : {
+                "module": "js/stage/stage-view.reel",
+                "name": "StageView",
+                "properties": {
+                    "element": {"#": "stageView"}
+                }
+            },
            "StageDeps1": {
                "module": "js/stage/stage-deps",
                "name": "StageDeps",
@@ -49,12 +57,12 @@
                "properties": {
                    "element":          {"#": "stageAndScenesContainer"},
                    "_iframeContainer":  {"#": "iframeContainer"},
-                    "codeViewContainer":  {"#": "codeViewContainer"},
                    "_layoutCanvas":  {"#": "layoutCanvas"},
                    "_canvas":  {"#": "stageCanvas"},
                    "_drawingCanvas":  {"#": "drawingCanvas"},
                    "stageDeps": {"@": "StageDeps1"},
                    "layout":   {"@": "layout1"},
+                                        "stageView": {"@": "stageView"},
                    "textTool": {"@": "textTool"}
                },
                "bindings": {
@@ -72,9 +80,9 @@
 <body>
    <section id="stageAndScenesContainer" class="stageAndScenesContainer">
+        <section id="stageView"></section>
        <section id="iframeContainer"></section>
        <section id="textToolObject">asdasd asd asd asd asd asd </section>
-        <section id="codeViewContainer"></section>
        <canvas id="layoutCanvas"></canvas>
        <canvas id="stageCanvas"></canvas>
        <canvas id="drawingCanvas"></canvas>
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 6d9a7355..89b2d475 100644..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.
 </copyright> */
-var Montage = require("montage/core/core").Montage,
+var Montage =   require("montage/core/core").Montage,
-    Component = require("montage/ui/component").Component;
+    Component = require("montage/ui/component").Component,
+    drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils,
-var drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils;
+    vecUtils =  require("js/helper-classes/3D/vec-utils").VecUtils;
-var vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils;
 exports.Stage = Montage.create(Component, {
@@ -117,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; },
@@ -248,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"));
@@ -883,5 +881,20 @@ exports.Stage = Montage.create(Component, {
            this.stageDeps.snapManager.updateWorkingPlaneFromView();
        }
-    }
+    },
+    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
author	Valerio Virgillito	2012-02-14 11:07:21 -0800
committer	Valerio Virgillito	2012-02-14 11:07:21 -0800
commit	f060190a3bffd9a16718f2ce0499699103d46372 (patch)
tree	a308fe7eacec2156c8212dff0892a3de925d5f9a /js/stage/stage.reel
parent	f766cc203f30ea43ae8b83cf4b65d45cc4435ee9 (diff)
parent	33bc9d62b8e6694500bf14d5b18187bd99a520a3 (diff)
download	ninja-f060190a3bffd9a16718f2ce0499699103d46372.tar.gz

diff --git a/js/stage/stage.reel/stage.css b/js/stage/stage.reel/stage.css index 54b9761b..54b9761b 100644..100755 --- a/js/stage/stage.reel/stage.css +++ b/js/stage/stage.reel/stage.css


diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html index 623c54b8..9ed0f636 100644..100755 --- a/js/stage/stage.reel/stage.html +++ b/js/stage/stage.reel/stage.html
@@ -11,6 +11,14 @@
11		11
12	<script type="text/montage-serialization">	12	<script type="text/montage-serialization">
13	{	13	{
		14	"stageView" : {
		15	"module": "js/stage/stage-view.reel",
		16	"name": "StageView",
		17	"properties": {
		18	"element": {"#": "stageView"}
		19	}
		20	},
		21
14	"StageDeps1": {	22	"StageDeps1": {
15	"module": "js/stage/stage-deps",	23	"module": "js/stage/stage-deps",
16	"name": "StageDeps",	24	"name": "StageDeps",
@@ -49,12 +57,12 @@
49	"properties": {	57	"properties": {
50	"element": {"#": "stageAndScenesContainer"},	58	"element": {"#": "stageAndScenesContainer"},
51	"_iframeContainer": {"#": "iframeContainer"},	59	"_iframeContainer": {"#": "iframeContainer"},
52	"codeViewContainer": {"#": "codeViewContainer"},
53	"_layoutCanvas": {"#": "layoutCanvas"},	60	"_layoutCanvas": {"#": "layoutCanvas"},
54	"_canvas": {"#": "stageCanvas"},	61	"_canvas": {"#": "stageCanvas"},
55	"_drawingCanvas": {"#": "drawingCanvas"},	62	"_drawingCanvas": {"#": "drawingCanvas"},
56	"stageDeps": {"@": "StageDeps1"},	63	"stageDeps": {"@": "StageDeps1"},
57	"layout": {"@": "layout1"},	64	"layout": {"@": "layout1"},
		65	"stageView": {"@": "stageView"},
58	"textTool": {"@": "textTool"}	66	"textTool": {"@": "textTool"}
59	},	67	},
60	"bindings": {	68	"bindings": {
@@ -72,9 +80,9 @@
72	<body>	80	<body>
73		81
74	<section id="stageAndScenesContainer" class="stageAndScenesContainer">	82	<section id="stageAndScenesContainer" class="stageAndScenesContainer">
		83	<section id="stageView"></section>
75	<section id="iframeContainer"></section>	84	<section id="iframeContainer"></section>
76	<section id="textToolObject">asdasd asd asd asd asd asd </section>	85	<section id="textToolObject">asdasd asd asd asd asd asd </section>
77	<section id="codeViewContainer"></section>
78	<canvas id="layoutCanvas"></canvas>	86	<canvas id="layoutCanvas"></canvas>
79	<canvas id="stageCanvas"></canvas>	87	<canvas id="stageCanvas"></canvas>
80	<canvas id="drawingCanvas"></canvas>	88	<canvas id="drawingCanvas"></canvas>


diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 6d9a7355..89b2d475 100644..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
4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.	4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5	</copyright> */	5	</copyright> */
6		6
7	var Montage = require("montage/core/core").Montage,	7	var Montage = require("montage/core/core").Montage,
8	Component = require("montage/ui/component").Component;	8	Component = require("montage/ui/component").Component,
9		9	drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils,
10	var drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils;	10	vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils;
11	var vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils;
12		11
13	exports.Stage = Montage.create(Component, {	12	exports.Stage = Montage.create(Component, {
14		13
@@ -117,9 +116,6 @@ exports.Stage = Montage.create(Component, {
117	_userContentLeft: { value: 0 },	116	_userContentLeft: { value: 0 },
118	_userContentTop: { value: 0 },	117	_userContentTop: { value: 0 },
119	_userContentBorder: { value: 0 },	118	_userContentBorder: { value: 0 },
120	savedLeftScroll: { value: null },
121	savedTopScroll: { value: null },
122
123		119
124	documentRoot: {	120	documentRoot: {
125	get: function () { return this._documentRoot; },	121	get: function () { return this._documentRoot; },
@@ -248,6 +244,8 @@ exports.Stage = Montage.create(Component, {
248		244
249	this._scrollLeft = this._iframeContainer.scrollLeft;	245	this._scrollLeft = this._iframeContainer.scrollLeft;
250	this._scrollTop = this._iframeContainer.scrollTop;	246	this._scrollTop = this._iframeContainer.scrollTop;
		247	this.application.ninja.currentDocument.savedLeftScroll = this._iframeContainer.scrollLeft;
		248	this.application.ninja.currentDocument.savedTopScroll = this._iframeContainer.scrollTop;
251		249
252	this.userContentBorder = parseInt(this._documentRoot.elementModel.controller.getProperty(this._documentRoot, "border"));	250	this.userContentBorder = parseInt(this._documentRoot.elementModel.controller.getProperty(this._documentRoot, "border"));
253		251
@@ -883,5 +881,20 @@ exports.Stage = Montage.create(Component, {
883		881
884	this.stageDeps.snapManager.updateWorkingPlaneFromView();	882	this.stageDeps.snapManager.updateWorkingPlaneFromView();
885	}	883	}
886	}	884	},
		885
		886	saveScroll:{
		887	value: function(){
		888	this.application.ninja.documentController.activeDocument.savedLeftScroll = this._iframeContainer.scrollLeft;
		889	this.application.ninja.documentController.activeDocument.savedTopScroll = this._iframeContainer.scrollTop;
		890	}
		891	},
		892	restoreScroll:{
		893	value: function(){
		894	this._iframeContainer.scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll;
		895	this._scrollLeft = this.application.ninja.documentController.activeDocument.savedLeftScroll;
		896	this._iframeContainer.scrollTop = this.application.ninja.documentController.activeDocument.savedTopScroll;
		897	this._scrollTop = this.application.ninja.documentController.activeDocument.savedTopScroll;
		898	}
		899	}
887	}); \ No newline at end of file	900	}); \ No newline at end of file