diff options
| author | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
| commit | 9f32d7e5454db3189209fc68a286a7fdb0c31fe8 (patch) | |
| tree | a51c2bf67839a25158c30752b44fdea0eac28b9d /node_modules/montage/ui/tabs.reel/tabs.html | |
| parent | dc1e8dde18c40cf740bd2fe09165784e0d415fab (diff) | |
| parent | 6d33345a9e609e36539d2efa25569f5eeb04a2af (diff) | |
| download | ninja-9f32d7e5454db3189209fc68a286a7fdb0c31fe8.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
js/helper-classes/3D/view-utils.js
Diffstat (limited to 'node_modules/montage/ui/tabs.reel/tabs.html')
| -rwxr-xr-x | node_modules/montage/ui/tabs.reel/tabs.html | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/node_modules/montage/ui/tabs.reel/tabs.html b/node_modules/montage/ui/tabs.reel/tabs.html index adb7c9a5..e3e655b2 100755 --- a/node_modules/montage/ui/tabs.reel/tabs.html +++ b/node_modules/montage/ui/tabs.reel/tabs.html | |||
| @@ -8,8 +8,8 @@ | |||
| 8 | <head> | 8 | <head> |
| 9 | <title></title> | 9 | <title></title> |
| 10 | <link rel="stylesheet" type="text/css" href="tabs.css"> | 10 | <link rel="stylesheet" type="text/css" href="tabs.css"> |
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization">{ |
| 12 | { | 12 | |
| 13 | "navController": { | 13 | "navController": { |
| 14 | "name": "ArrayController", | 14 | "name": "ArrayController", |
| 15 | "module": "montage/ui/controller/array-controller", | 15 | "module": "montage/ui/controller/array-controller", |
| @@ -18,11 +18,7 @@ | |||
| 18 | "automaticallyOrganizeObjects": true | 18 | "automaticallyOrganizeObjects": true |
| 19 | }, | 19 | }, |
| 20 | "bindings": { | 20 | "bindings": { |
| 21 | "content": { | 21 | "content": {"<-": "@owner.tabs"} |
| 22 | "boundObject": {"@": "owner"}, | ||
| 23 | "boundObjectPropertyPath": "tabs", | ||
| 24 | "oneway": true | ||
| 25 | } | ||
| 26 | } | 22 | } |
| 27 | }, | 23 | }, |
| 28 | 24 | ||
| @@ -56,15 +52,11 @@ | |||
| 56 | } | 52 | } |
| 57 | }, | 53 | }, |
| 58 | "bindings": { | 54 | "bindings": { |
| 59 | "selectedTabs": { | 55 | "selectedTabs": {"<-": "@navController.selectedObjects"} |
| 60 | "boundObject": {"@": "navController"}, | ||
| 61 | "boundObjectPropertyPath": "selectedObjects", | ||
| 62 | "oneway": true | ||
| 63 | } | ||
| 64 | } | 56 | } |
| 65 | } | 57 | } |
| 66 | } | 58 | |
| 67 | </script> | 59 | }</script> |
| 68 | 60 | ||
| 69 | </head> | 61 | </head> |
| 70 | <body> | 62 | <body> |