From ac2db49e51f82f5a1cf52ec854b047e007ffbdd7 Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Mon, 12 Mar 2012 13:39:58 -0700
Subject: Committing Disabled states for tool-bar, tool-options, viewbar,
 breadcrumb

Signed-off-by: Armen Kesablyan <armen@motorola.com>
---
 js/ninja.reel/ninja.html | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

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

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 8f6f6d7b..4dd6e25d 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -316,6 +316,20 @@
                     "timeline":             {"@": "timeline"},
                     "mainMenuController":   {"@": "mainMenuController"}
                 }
+            },
+            "toolOptionsDisable": {
+                "module": "montage/ui/condition.reel",
+                "name": "Condition",
+                "properties": {
+                    "element": {"#": "disabledCondition"}
+                },
+                "bindings": {
+                    "condition": {
+                        "boundObject": {"@": "owner"},
+                        "boundObjectPropertyPath": "disabled",
+                        "oneway": true
+                    }
+                }
             }
         }
     </script>
@@ -340,6 +354,7 @@
                 <div id="topPanel" class="panel">
                     <div id="toolPropertiesPanel">
                         <div id="toolsProperties"></div>
+                        <div id="disabledCondition" class="panelDisabled"></div>
                     </div>
 
                     <div id="stageMode" class="unselectable marginposition">
-- 
cgit v1.2.3


From c24f58c10231c30d3a8a4c9fb9a4f395dd746180 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Mon, 12 Mar 2012 16:25:47 -0700
Subject: Merge dhg637 DisabledState into master.

Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumb

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

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

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 4dd6e25d..8f6f6d7b 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -316,20 +316,6 @@
                     "timeline":             {"@": "timeline"},
                     "mainMenuController":   {"@": "mainMenuController"}
                 }
-            },
-            "toolOptionsDisable": {
-                "module": "montage/ui/condition.reel",
-                "name": "Condition",
-                "properties": {
-                    "element": {"#": "disabledCondition"}
-                },
-                "bindings": {
-                    "condition": {
-                        "boundObject": {"@": "owner"},
-                        "boundObjectPropertyPath": "disabled",
-                        "oneway": true
-                    }
-                }
             }
         }
     </script>
@@ -354,7 +340,6 @@
                 <div id="topPanel" class="panel">
                     <div id="toolPropertiesPanel">
                         <div id="toolsProperties"></div>
-                        <div id="disabledCondition" class="panelDisabled"></div>
                     </div>
 
                     <div id="stageMode" class="unselectable marginposition">
-- 
cgit v1.2.3


From 7a481168f1dd52069023cc0c8766f8078fe20089 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Wed, 14 Mar 2012 11:43:11 -0700
Subject: Removing the obsolete modalContainer div.

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

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

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 8f6f6d7b..3dc45498 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -399,8 +399,6 @@
         
         <section id="popupWindows"></section>
 
-        <div id="modalContainer"></div>
-
     </div>
 
 </body>
-- 
cgit v1.2.3