From 7e94d5786df400b599df3233b3086bfe9eff2bde Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Wed, 16 May 2012 22:58:24 -0700
Subject: Objects Panel - Add Objects controller and montage/application hack
 to expose template

---
 js/ninja.reel/ninja.html | 5 +++++
 1 file changed, 5 insertions(+)

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

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 52a6daa2..7c3bc2c4 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -321,6 +321,10 @@
                 "prototype": "js/controllers/code-editor-controller"
             },
 
+            "objectsController" : {
+                "prototype": "js/controllers/objects-controller"
+            },
+
             "owner": {
                 "prototype": "js/ninja.reel",
                 "properties": {
@@ -350,6 +354,7 @@
                     "timeline":             {"@": "timeline"},
                     "mainMenuController":   {"@": "mainMenuController"},
                     "codeEditorController": {"@": "codeEditorController"},
+                    "objectsController":    {"@": "objectsController"},
                     "rightPanelContainer":  {"#": "rightPanelContainer" },
                     "panelSplitter":        {"@": "splitter3"},
                     "timelineSplitter":     {"@": "splitter4"},
-- 
cgit v1.2.3


From 95bef3bbd77c6c3bd01b5222986f2dd35a7218b4 Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Sat, 19 May 2012 14:48:35 -0700
Subject: Changes to binding view

Signed-off-by: Armen Kesablyan <armen@motorola.com>
---
 js/ninja.reel/ninja.html | 5 ++++-
 1 file changed, 4 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 12dbf660..1f0582b1 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -324,7 +324,10 @@
             },
 
             "objectsController" : {
-                "prototype": "js/controllers/objects-controller"
+                "prototype": "js/controllers/objects-controller",
+                "bindings": {
+                    "activeDocument": {"<-": "@owner.currentDocument"}
+                }
             },
 
             "owner": {
-- 
cgit v1.2.3


From e09efe3212e86ac794de3fc8ecfc6cdef7b15181 Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Wed, 30 May 2012 15:02:23 -0700
Subject: Objects Controller - Add bindable controller properties, and bindings
 getter

---
 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 1f0582b1..53b8676f 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -326,7 +326,7 @@
             "objectsController" : {
                 "prototype": "js/controllers/objects-controller",
                 "bindings": {
-                    "activeDocument": {"<-": "@owner.currentDocument"}
+                    "currentDocument": {"<-": "@owner.currentDocument"}
                 }
             },
 
-- 
cgit v1.2.3


From 337efc667372326ae2f9984d89a47bb151016774 Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Mon, 11 Jun 2012 13:25:13 -0700
Subject: Changes Made to Object Listing of iFrame

Signed-off-by: Armen Kesablyan <armen@motorola.com>
---
 js/ninja.reel/ninja.html | 3 ++-
 1 file changed, 2 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 221e492c..11f7c53e 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -363,7 +363,8 @@
             "objectsController" : {
                 "prototype": "js/controllers/objects-controller",
                 "bindings": {
-                    "currentDocument": {"<-": "@owner.currentDocument"}
+                    "currentDocument": {"<-": "@documentList.selectedObjects.0"},
+                    "objects": {"<-": "@documentList.selectedObjects.0.model.mObjects"}
                 }
             },
 
-- 
cgit v1.2.3


From 96e1bb2a8d842dc37e4982a273a5bde48f6944c3 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Mon, 25 Jun 2012 16:37:06 -0700
Subject: Fix for IKNINJA-1615: Enable mouse up event on top of the user
 document scrollbar

Chrome has a bug where mouse up does not fire when the mouse is released on top of a scrollbar. To work around this issue, I temporary increase the canvas to cover the scrollbar when drawing and then shrink it back on mouse up.

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

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

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index beae59d9..1bd002ae 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -261,10 +261,6 @@
                 }
             },
 
-            "mouseMediator": {
-                "prototype": "js/mediators/mouse-mediator"
-            },
-
             "keyboardMediator": {
                 "prototype": "js/mediators/keyboard-mediator",
                 "properties":{
-- 
cgit v1.2.3