aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets/content.reel
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-06-13 13:51:39 -0700
committerNivesh Rajbhandari2012-06-13 13:51:39 -0700
commit263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch)
tree7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/panels/presets/content.reel
parent1bb2778224982aea7b9781c6559bb659983a400f (diff)
parenta827f2769d75848c0ba0bff03a927c1f2706322b (diff)
downloadninja-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 'js/panels/presets/content.reel')
-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,