From 4c3aac5eabd93052b1554a03d78235215bb49db4 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 29 May 2012 00:34:40 -0700
Subject: document bindings phase 1

- using array controller to bind the current document to all ninja components
- removed open document event
- removed references to the document controller

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/stage/stage.reel/stage.html | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'js/stage/stage.reel/stage.html')

diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index 30c3d231..89b674ab 100755
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -18,25 +18,25 @@
                 }
             },
 
-            "StageDeps1": {
+            "stageDeps": {
                 "prototype": "js/stage/stage-deps",
                 "properties": {
                     "stage": {"@": "owner"}
+                },
+                "bindings": {
+                    "currentDocument": {"<-": "@owner.currentDocument"}
                 }
             },
 
-            "layout1": {
+            "layout": {
                 "prototype": "js/stage/layout",
                 "properties": {
                     "canvas": {"#": "layoutCanvas"},
                     "stage": {"@": "owner"}
                 },
                 "bindings": {
-                    "layoutView": {
-                        "boundObject": {"@": "owner" },
-                        "boundObjectPropertyPath": "appModel.layoutView",
-                        "oneway": true
-                    }
+                    "layoutView": {"<-": "@owner.appModel.layoutView"},
+                    "currentDocument": {"<-": "@owner.currentDocument"}
                 }
             },
 
@@ -59,8 +59,8 @@
                     "_layoutCanvas":  {"#": "layoutCanvas"},
                     "_canvas":  {"#": "stageCanvas"},
                     "_drawingCanvas":  {"#": "drawingCanvas"},
-                    "stageDeps": {"@": "StageDeps1"},
-                    "layout":   {"@": "layout1"},
+                    "stageDeps": {"@": "stageDeps"},
+                    "layout":   {"@": "layout"},
 					"stageView": {"@": "stageView"},
                     "textTool": {"@": "textTool"},
                     "focusManager": {"@": "focusManager"}
-- 
cgit v1.2.3


From 2fd6db5f46208a5aa8fa58d090f795e5b7eb99bb Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Tue, 29 May 2012 10:35:06 -0700
Subject: Sped up user-interaction by moving grid drawing into its own canvas
 so the layout code doesn't have to be run when modifying selected elements.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/stage/stage.reel/stage.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'js/stage/stage.reel/stage.html')

diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index 30c3d231..a819fc79 100755
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -57,6 +57,7 @@
                     "element":          {"#": "stageAndScenesContainer"},
                     "_iframeContainer":  {"#": "iframeContainer"},
                     "_layoutCanvas":  {"#": "layoutCanvas"},
+                    "_gridCanvas":  {"#": "gridCanvas"},
                     "_canvas":  {"#": "stageCanvas"},
                     "_drawingCanvas":  {"#": "drawingCanvas"},
                     "stageDeps": {"@": "StageDeps1"},
@@ -83,6 +84,7 @@
         <section data-montage-id="stageView"></section>
         <section data-montage-id="iframeContainer" id="iframeContainer"></section>
         <section data-montage-id="textToolObject"></section>
+        <canvas data-montage-id="gridCanvas" class="gridCanvas"></canvas>
         <canvas data-montage-id="layoutCanvas" class="layoutCanvas"></canvas>
         <canvas data-montage-id="stageCanvas" class="stageCanvas"></canvas>
         <canvas data-montage-id="drawingCanvas" class="drawingCanvas"></canvas>
-- 
cgit v1.2.3


From 169df50391a35e9c7865033dd089a37324bcfa47 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Wed, 30 May 2012 11:30:17 -0700
Subject: remove current document binding from the stage deps

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/stage/stage.reel/stage.html | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'js/stage/stage.reel/stage.html')

diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index 1b5cec17..45667e06 100755
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -22,9 +22,6 @@
                 "prototype": "js/stage/stage-deps",
                 "properties": {
                     "stage": {"@": "owner"}
-                },
-                "bindings": {
-                    "currentDocument": {"<-": "@owner.currentDocument"}
                 }
             },
 
-- 
cgit v1.2.3


From 163e977e5819b4bf7029be0562ee7f31045f05c4 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 31 May 2012 15:53:45 -0700
Subject: removing the stage view component as it is not used anymore

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/stage/stage.reel/stage.html | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'js/stage/stage.reel/stage.html')

diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index 45667e06..7a9619cd 100755
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -11,13 +11,6 @@
 
     <script type="text/montage-serialization">
         {
-            "stageView" : {
-                "prototype": "js/stage/stage-view.reel",
-                "properties": {
-                    "element": {"#": "stageView"}
-                }
-            },
-
             "stageDeps": {
                 "prototype": "js/stage/stage-deps",
                 "properties": {
@@ -59,7 +52,6 @@
                     "_drawingCanvas":  {"#": "drawingCanvas"},
                     "stageDeps": {"@": "stageDeps"},
                     "layout":   {"@": "layout"},
-					"stageView": {"@": "stageView"},
                     "textTool": {"@": "textTool"},
                     "focusManager": {"@": "focusManager"}
                 },
@@ -78,7 +70,7 @@
 <body>
 
     <section data-montage-id="stageAndScenesContainer" class="stageAndScenesContainer">
-        <section data-montage-id="stageView"></section>
+        <section id="codeViewContainer" class="codeViewContainer"></section>
         <section data-montage-id="iframeContainer" id="iframeContainer"></section>
         <section data-montage-id="textToolObject"></section>
         <canvas data-montage-id="gridCanvas" class="gridCanvas"></canvas>
-- 
cgit v1.2.3