aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets
diff options
context:
space:
mode:
authorhwc4872012-06-13 14:04:09 -0700
committerhwc4872012-06-13 14:04:09 -0700
commit3e481dd581e0305dd8b572ed0d17e86622223464 (patch)
treeaca2b28aa72857a52e047fb94090c34ab8dd1c2c /js/panels/presets
parenta7aa51e6b91623772eef54b827616432838b560e (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/panels/presets')
-rw-r--r--js/panels/presets/content.reel/content.js15
1 files changed, 14 insertions, 1 deletions
diff --git a/js/panels/presets/content.reel/content.js b/js/panels/presets/content.reel/content.js
index 1ede7246..eba150c3 100644
--- a/js/panels/presets/content.reel/content.js
+++ b/js/panels/presets/content.reel/content.js
@@ -14,6 +14,10 @@ exports.content = Montage.create(Component, {
14 contentPanel : { 14 contentPanel : {
15 value: null 15 value: null
16 }, 16 },
17 activeTabIndex: {
18 value: null,
19 serializable: true
20 },
17 templateDidLoad : { 21 templateDidLoad : {
18 value: function() { 22 value: function() {
19 var storedTabIndex = this.application.localStorage.getItem("presetsTabIndex"); 23 var storedTabIndex = this.application.localStorage.getItem("presetsTabIndex");
@@ -55,7 +59,16 @@ exports.content = Montage.create(Component, {
55 this._activeTab = tabObject; 59 this._activeTab = tabObject;
56 60
57 this.needsDraw = this._needsTabSwitch = true; 61 this.needsDraw = this._needsTabSwitch = true;
58 } 62 },
63 serializable: true
64 },
65 tabBar: {
66 value: null,
67 serializable: true
68 },
69 tabs:{
70 value: null,
71 serializable: true
59 }, 72 },
60 _tabToDeactivate : { 73 _tabToDeactivate : {
61 value: null, 74 value: null,