diff options
author | Valerio Virgillito | 2012-03-12 16:25:47 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-03-12 16:25:47 -0700 |
commit | c24f58c10231c30d3a8a4c9fb9a4f395dd746180 (patch) | |
tree | a0be6ee1daa3e21ed7df483721bc3116e4c20006 /js/ninja.reel/ninja.html | |
parent | ac2db49e51f82f5a1cf52ec854b047e007ffbdd7 (diff) | |
download | ninja-c24f58c10231c30d3a8a4c9fb9a4f395dd746180.tar.gz |
Merge dhg637 DisabledState into master.
Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumb
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-x | js/ninja.reel/ninja.html | 15 |
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 @@ | |||
316 | "timeline": {"@": "timeline"}, | 316 | "timeline": {"@": "timeline"}, |
317 | "mainMenuController": {"@": "mainMenuController"} | 317 | "mainMenuController": {"@": "mainMenuController"} |
318 | } | 318 | } |
319 | }, | ||
320 | "toolOptionsDisable": { | ||
321 | "module": "montage/ui/condition.reel", | ||
322 | "name": "Condition", | ||
323 | "properties": { | ||
324 | "element": {"#": "disabledCondition"} | ||
325 | }, | ||
326 | "bindings": { | ||
327 | "condition": { | ||
328 | "boundObject": {"@": "owner"}, | ||
329 | "boundObjectPropertyPath": "disabled", | ||
330 | "oneway": true | ||
331 | } | ||
332 | } | ||
333 | } | 319 | } |
334 | } | 320 | } |
335 | </script> | 321 | </script> |
@@ -354,7 +340,6 @@ | |||
354 | <div id="topPanel" class="panel"> | 340 | <div id="topPanel" class="panel"> |
355 | <div id="toolPropertiesPanel"> | 341 | <div id="toolPropertiesPanel"> |
356 | <div id="toolsProperties"></div> | 342 | <div id="toolsProperties"></div> |
357 | <div id="disabledCondition" class="panelDisabled"></div> | ||
358 | </div> | 343 | </div> |
359 | 344 | ||
360 | <div id="stageMode" class="unselectable marginposition"> | 345 | <div id="stageMode" class="unselectable marginposition"> |