diff options
| author | Pushkar Joshi | 2012-03-13 11:36:11 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-13 11:36:11 -0700 |
| commit | 6023f7c8258e660388ee33730601f1161f9299e9 (patch) | |
| tree | 632484428b398f71b8481aa8e30180895ff2483c /js | |
| parent | 76f2021618c0a6a99a1b855233e353e84ca99467 (diff) | |
| parent | 4ad1650f629e7e345eade52ed6dadc233b27cc45 (diff) | |
| download | ninja-6023f7c8258e660388ee33730601f1161f9299e9.tar.gz | |
Merge branch 'pentool' into brushtool
Diffstat (limited to 'js')
107 files changed, 1806 insertions, 764 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.css b/js/components/layout/bread-crumb.reel/bread-crumb.css index 67497e10..dcfd471c 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.css +++ b/js/components/layout/bread-crumb.reel/bread-crumb.css | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | background-color: #282828; | 8 | background-color: #282828; |
| 9 | border-style: double; | 9 | border-style: double; |
| 10 | height: 26px; | 10 | height: 26px; |
| 11 | 11 | position:relative; | |
| 12 | -webkit-box-flex: 0; | 12 | -webkit-box-flex: 0; |
| 13 | } | 13 | } |
| 14 | 14 | ||
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html index f2368e9a..413f588d 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.html +++ b/js/components/layout/bread-crumb.reel/bread-crumb.html | |||
| @@ -60,6 +60,20 @@ | |||
| 60 | "oneway": true | 60 | "oneway": true |
| 61 | } | 61 | } |
| 62 | } | 62 | } |
| 63 | }, | ||
| 64 | |||
| 65 | "disable": { | ||
| 66 | "prototype": "montage/ui/condition.reel", | ||
| 67 | "properties": { | ||
| 68 | "element": {"#": "disabledCondition"} | ||
| 69 | }, | ||
| 70 | "bindings": { | ||
| 71 | "condition": { | ||
| 72 | "boundObject": {"@": "owner"}, | ||
| 73 | "boundObjectPropertyPath": "disabled", | ||
| 74 | "oneway": true | ||
| 75 | } | ||
| 76 | } | ||
| 63 | } | 77 | } |
| 64 | } | 78 | } |
| 65 | </script> | 79 | </script> |
| @@ -71,6 +85,7 @@ | |||
| 71 | <div id="breadcrumb_container"> | 85 | <div id="breadcrumb_container"> |
| 72 | <button id="breadcrumb_button" class="nj-skinned"></button> | 86 | <button id="breadcrumb_button" class="nj-skinned"></button> |