aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js2
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.js6
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.js8
3 files changed, 8 insertions, 8 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 94ca9b57..c382c9a7 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -110,7 +110,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
110 this._selectedLayerID = newVal; 110 this._selectedLayerID = newVal;
111 this._captureSelection = true; 111 this._captureSelection = true;
112 if (this.currentLayerSelected !== false) { 112 if (this.currentLayerSelected !== false) {
113 this.selectLayer(selectIndex, true); 113 this.selectLayer(selectIndex, false);
114 } 114 }
115 if (this.currentLayersSelected !== false) { 115 if (this.currentLayersSelected !== false) {
116 this.selectLayers(this.currentLayersSelected); 116 this.selectLayers(this.currentLayersSelected);
diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js
index 37fd9b44..e028d1db 100755
--- a/js/panels/components-panel.reel/components-panel.js
+++ b/js/panels/components-panel.reel/components-panel.js
@@ -6,9 +6,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
6 6
7var Montage = require("montage/core/core").Montage, 7var Montage = require("montage/core/core").Montage,
8 Component = require("montage/ui/component").Component, 8 Component = require("montage/ui/component").Component,
9 ClassUUID = require("js/components/core/class-uuid").ClassUuid; 9 NJUtils = require("js/lib/NJUtils").NJUtils;
10 10 ClassUUID = require("js/components/core/class-uuid").ClassUuid,
11var PIData = require("js/data/pi/pi-data").PiData; 11 PIData = require("js/data/pi/pi-data").PiData;
12 12
13String.prototype.capitalizeFirstChar = function() { 13String.prototype.capitalizeFirstChar = function() {
14 return this.charAt(0).toUpperCase() + this.slice(1); 14 return this.charAt(0).toUpperCase() + this.slice(1);
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js
index 3ab32888..49b4414e 100755
--- a/js/panels/properties.reel/sections/custom.reel/custom.js
+++ b/js/panels/properties.reel/sections/custom.reel/custom.js
@@ -262,10 +262,10 @@ exports.CustomSection = Montage.create(Component, {
262 if(aField.enabled.boundObject) { 262 if(aField.enabled.boundObject) {
263 // TODO - For now, always bind to this.controls[someProperty] 263 // TODO - For now, always bind to this.controls[someProperty]
264 Object.defineBinding(obj, "enabled", { 264 Object.defineBinding(obj, "enabled", {
265 boundObject: this.controls, 265 boundObject: this.controls,
266 boundObjectPropertyPath: aField.enabled.boundProperty, 266 boundObjectPropertyPath: aField.enabled.boundProperty,
267 oneway: false 267 oneway: false
268 }); 268 });
269 } else { 269 } else {
270 obj.enabled = aField.enabled; 270 obj.enabled = aField.enabled;
271 } 271 }