Merge dhg637 DisabledState into master.

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

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 0 insertions, 15 deletions

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">