From 4937b39fb0cf542f57cdadc7d1e2ed9798f7ef87 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Wed, 15 Feb 2012 16:09:14 -0800
Subject: fixes to document tabbing

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/ninja.reel/ninja.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 9a1a6b97..2d00d8dc 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -348,10 +348,10 @@
                             <div id="openDocumentsTabComponent"></div>
                         </section>
 
-                        <section id="rulerTop"></section>
+                        <section id="rulerTop" style="display:none;"></section>
 
                         <section id="mainContent">
-                            <section id="rulerLeft"></section>
+                            <section id="rulerLeft" style="display:none;"></section>
                             <section id="stageAndScenesContainer"></section>
                         </section>
 
-- 
cgit v1.2.3


From 302ae3c1812086d976eb67c9cf693c43205f3904 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Thu, 16 Feb 2012 11:13:05 -0800
Subject: hide the rulers when no document is open

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/ninja.reel/ninja.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 2d00d8dc..9a1a6b97 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -348,10 +348,10 @@
                             <div id="openDocumentsTabComponent"></div>
                         </section>
 
-                        <section id="rulerTop" style="display:none;"></section>
+                        <section id="rulerTop"></section>
 
                         <section id="mainContent">
-                            <section id="rulerLeft" style="display:none;"></section>
+                            <section id="rulerLeft"></section>
                             <section id="stageAndScenesContainer"></section>
                         </section>
 
-- 
cgit v1.2.3


From a9c369c2e5d8f6fc8d936f7e1e6b84f693226ddf Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Thu, 16 Feb 2012 13:11:48 -0800
Subject: moved file picker in file io

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/ninja.reel/ninja.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 9a1a6b97..07347cd7 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -255,7 +255,7 @@
             },
 
             "filePickerController": {
-                "module": "js/components/ui/FilePicker/file-picker-controller",
+                "module": "js/io/ui/file-picker/file-picker-controller",
                 "name": "FilePickerController"
             },
 
-- 
cgit v1.2.3


From f9d34a54baf61ccdf77732b1aaedb29d296b8c2e Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Mon, 20 Feb 2012 23:03:48 -0800
Subject: enabling nested selection

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

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

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index c9f17e3b..65cbfc28 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -228,7 +228,15 @@
 
             "selectionController1": {
                 "module": "js/controllers/selection-controller",
-                "name": "SelectionController"
+                "name": "SelectionController",
+                "bindings" : {
+                    "selectionContainer": {
+                        "boundObject": {"@": "owner"},
+                        "boundObjectPropertyPath": "currentSelectedContainer",
+                        "oneway": true
+                    }
+                }
+
             },
 
             "documentController1": {
-- 
cgit v1.2.3