diff options
author | Jon Reid | 2012-06-15 10:10:41 -0700 |
---|---|---|
committer | Jon Reid | 2012-06-15 10:10:41 -0700 |
commit | 526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch) | |
tree | 65939e59615aaa10a7db77211e71616ad531bd0e /node_modules/montage/ui/tabs.reel | |
parent | b5b760ee82e5cc4da176914983a6002cbf86c11a (diff) | |
parent | 5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff) | |
download | ninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz |
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'node_modules/montage/ui/tabs.reel')
-rwxr-xr-x | node_modules/montage/ui/tabs.reel/tabs.html | 6 | ||||
-rwxr-xr-x | node_modules/montage/ui/tabs.reel/tabs.js | 21 |
2 files changed, 15 insertions, 12 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" |
diff --git a/node_modules/montage/ui/tabs.reel/tabs.js b/node_modules/montage/ui/tabs.reel/tabs.js index 60b18480..4836e455 100755 --- a/node_modules/montage/ui/tabs.reel/tabs.js +++ b/node_modules/montage/ui/tabs.reel/tabs.js | |||
@@ -27,13 +27,14 @@ var Montage = require("montage").Montage, | |||
27 | 27 | ||
28 | var Tabs = exports.Tabs = Montage.create(Component, /** @lends module:"montage/ui/tabs.reel".Tabs# */ { | 28 | var Tabs = exports.Tabs = Montage.create(Component, /** @lends module:"montage/ui/tabs.reel".Tabs# */ { |
29 | 29 | ||
30 | hasTemplate: { | 30 | _repetition: { |
31 | value: true | 31 | value: null, |
32 | serializable: true | ||
32 | }, | 33 | }, |
33 | 34 | ||
34 | _repetition: { | 35 | _indicator: { |
35 | enumerable: false, | 36 | value: null, |
36 | value: null | 37 | serializable: true |
37 | }, | 38 | }, |
38 | /** | 39 | /** |
39 | Description TODO | 40 | Description TODO |
@@ -41,13 +42,14 @@ var Tabs = exports.Tabs = Montage.create(Component, /** @lends module:"montage/u | |||
41 | @default {Array} [] | 42 | @default {Array} [] |
42 | */ | 43 | */ |
43 | tabs: { | 44 | tabs: { |
44 | enumerable: false, | ||
45 | distinct: true, | 45 | distinct: true, |
46 | serializable: true, | ||
46 | value: [] | 47 | value: [] |
47 | }, | 48 | }, |
48 | 49 | ||
49 | navController: { | 50 | navController: { |
50 | value: null | 51 | value: null, |
52 | serializable: true | ||
51 | }, | 53 | }, |
52 | // optional property. If provided, this will result in wiring tab clicks to switching components in content | 54 | // optional property. If provided, this will result in wiring tab clicks to switching components in content |
53 | /** | 55 | /** |
@@ -57,6 +59,7 @@ var Tabs = exports.Tabs = Montage.create(Component, /** @lends module:"montage/u | |||
57 | */ | 59 | */ |
58 | content: { | 60 | content: { |
59 | enumerable: false, | 61 | enumerable: false, |
62 | serializable: true, | ||
60 | value: null | 63 | value: null |
61 | }, | 64 | }, |
62 | 65 | ||
@@ -87,13 +90,13 @@ var Tabs = exports.Tabs = Montage.create(Component, /** @lends module:"montage/u | |||
87 | var index = this._indexOf(value); | 90 | var index = this._indexOf(value); |
88 | this.navController.selectedIndexes = [index]; | 91 | this.navController.selectedIndexes = [index]; |
89 | } | 92 | } |
90 | } | 93 | }, |
94 | serializable: true | ||
91 | }, | 95 | }, |
92 | 96 | ||
93 | 97 | ||
94 | _selectedTab: {value: null}, | 98 | _selectedTab: {value: null}, |
95 | selectedTab: { | 99 | selectedTab: { |
96 | distinct: true, | ||
97 | enumerable: false, | 100 | enumerable: false, |
98 | get: function() { | 101 | get: function() { |
99 | return this._selectedTab; | 102 | return this._selectedTab; |