diff options
author | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
commit | 263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch) | |
tree | 7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /node_modules/montage/ui/tabs.reel/tabs.html | |
parent | 1bb2778224982aea7b9781c6559bb659983a400f (diff) | |
parent | a827f2769d75848c0ba0bff03a927c1f2706322b (diff) | |
download | ninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz |
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts:
js/panels/properties.reel/sections/position-size.reel/position-size.html
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/tabs.reel/tabs.html')
-rwxr-xr-x | node_modules/montage/ui/tabs.reel/tabs.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/node_modules/montage/ui/tabs.reel/tabs.html b/node_modules/montage/ui/tabs.reel/tabs.html index 7ea9a438..f069d1cb 100755 --- a/node_modules/montage/ui/tabs.reel/tabs.html +++ b/node_modules/montage/ui/tabs.reel/tabs.html | |||
@@ -11,7 +11,7 @@ | |||
11 | <script type="text/montage-serialization">{ | 11 | <script type="text/montage-serialization">{ |
12 | 12 | ||
13 | "navController": { | 13 | "navController": { |
14 | "prototype": "montage/ui/controller/array-controller", | 14 | "prototype": "ui/controller/array-controller", |
15 | "properties": { | 15 | "properties": { |
16 | "selectObjectsOnAddition": true, | 16 | "selectObjectsOnAddition": true, |
17 | "automaticallyOrganizeObjects": true | 17 | "automaticallyOrganizeObjects": true |
@@ -22,7 +22,7 @@ | |||
22 | }, | 22 | }, |
23 | 23 | ||
24 | "repetition1": { | 24 | "repetition1": { |
25 | "prototype": "montage/ui/repetition.reel", | 25 | "prototype": "ui/repetition.reel", |
26 | "properties": { | 26 | "properties": { |
27 | "element": { | 27 | "element": { |
28 | "#": "tab-list" | 28 | "#": "tab-list" |
@@ -33,7 +33,7 @@ | |||
33 | }, | 33 | }, |
34 | 34 | ||
35 | "owner": { | 35 | "owner": { |
36 | "prototype": "montage/ui/tabs.reel", | 36 | "prototype": "ui/tabs.reel", |
37 | "properties": { | 37 | "properties": { |
38 | "element": { | 38 | "element": { |
39 | "#": "tabs-nav" | 39 | "#": "tabs-nav" |