aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
Diffstat (limited to 'js/components')
-rwxr-xr-xjs/components/SliderBase.js2
-rwxr-xr-xjs/components/colorwheel.reel/colorwheel.js4
-rwxr-xr-xjs/components/combobox.reel/combobox.js4
-rwxr-xr-xjs/components/core/class-uuid.js2
-rw-r--r--js/components/editable.reel/editable.js38
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.js6
-rw-r--r--js/components/hintable.reel/hintable.js62
-rwxr-xr-xjs/components/hottext.reel/hottext.js4
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.js2
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.js2
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.js2
-rw-r--r--js/components/prompt.reel/prompt.js2
-rwxr-xr-xjs/components/radio.reel/radio.js2
-rwxr-xr-xjs/components/slider.reel/slider.js10
-rwxr-xr-xjs/components/textfield.reel/textfield.js2
-rw-r--r--js/components/toolbar.reel/toolbar.js2
-rwxr-xr-xjs/components/tools-properties/eraser-properties.reel/eraser-properties.js2
-rwxr-xr-xjs/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.js2
-rwxr-xr-xjs/components/tools-properties/line-properties.reel/line-properties.js2
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.js6
-rwxr-xr-xjs/components/tools-properties/pan-properties.reel/pan-properties.js2
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.js2
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.js2
-rwxr-xr-xjs/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.js2
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.js2
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.js2
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.js4
-rwxr-xr-xjs/components/tools-properties/tool-properties.js2
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.js22
-rwxr-xr-xjs/components/ui/input-group.reel/input-group.js4
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.js2
31 files changed, 102 insertions, 102 deletions
diff --git a/js/components/SliderBase.js b/js/components/SliderBase.js
index 5a12fcb6..30bba8de 100755
--- a/js/components/SliderBase.js
+++ b/js/components/SliderBase.js
@@ -88,7 +88,7 @@ var SliderBase = exports.SliderBase = Montage.create(Component, {
88 if(this._enabled) 88 if(this._enabled)
89 { 89 {
90 this.element.classList.remove("disabled"); 90 this.element.classList.remove("disabled");
91 91
92 this.element.addEventListener("blur", this); 92 this.element.addEventListener("blur", this);
93 this.element.addEventListener("focus", this); 93 this.element.addEventListener("focus", this);
94 94
diff --git a/js/components/colorwheel.reel/colorwheel.js b/js/components/colorwheel.reel/colorwheel.js
index 97a1751d..d2664f14 100755
--- a/js/components/colorwheel.reel/colorwheel.js
+++ b/js/components/colorwheel.reel/colorwheel.js
@@ -270,7 +270,7 @@ exports.ColorWheel = Montage.create(Component, {
270 // 270 //
271 this._isMouseDown = true; 271 this._isMouseDown = true;
272 // 272 //
273 if ((e.offsetY < this._math.swatchPosition || e.offsetY > this._math.swatchLength+this._math.swatchPosition) || (e.offsetX < this._math.swatchPosition || e.offsetX > this._math.swatchLength+this._math.swatchPosition)) { 273 if ((e.offsetY < this._math.swatchPosition || e.offsetY > this._math.swatchLength+this._math.swatchPosition) || (e.offsetX < this._math.swatchPosition || e.offsetX > this._math.swatchLength+this._math.swatchPosition)) {
274 this._scanningMode = 'wheel'; 274 this._scanningMode = 'wheel';
275 } else { 275 } else {
276 this._scanningMode = 'swatch'; 276 this._scanningMode = 'swatch';
@@ -283,7 +283,7 @@ exports.ColorWheel = Montage.create(Component, {
283 value: function(e) { 283 value: function(e) {
284 var math = this._math; 284 var math = this._math;
285 // 285 //
286 if ((e.offsetY < math.swatchPosition || e.offsetY > math.swatchLength+math.swatchPosition) || (e.offsetX < math.swatchPosition || e.offsetX > math.swatchLength+math.swatchPosition)) { 286 if ((e.offsetY < math.swatchPosition || e.offsetY > math.swatchLength+math.swatchPosition) || (e.offsetX < math.swatchPosition || e.offsetX > math.swatchLength+math.swatchPosition)) {
287 if (this._scanningMode === 'wheel') { 287 if (this._scanningMode === 'wheel') {
288 this.mouseSetWheelAngle(e); 288 this.mouseSetWheelAngle(e);
289 } 289 }
diff --git a/js/components/combobox.reel/combobox.js b/js/components/combobox.reel/combobox.js
index 0d46e1ff..f923e30c 100755
--- a/js/components/combobox.reel/combobox.js
+++ b/js/components/combobox.reel/combobox.js
@@ -80,7 +80,7 @@ exports.Combobox = Montage.create(Component, {
80 } 80 }
81 } 81 }
82 }, 82 },
83 83
84 _value: { 84 _value: {
85 enumerable: false, 85 enumerable: false,
86 value: null 86 value: null
@@ -166,7 +166,7 @@ exports.Combobox = Montage.create(Component, {
166 if(!this._valueSyncedWithInputField) 166 if(!this._valueSyncedWithInputField)
167 { 167 {
168 this.element.innerHTML = ""; 168 this.element.innerHTML = "";
169 169
170 var optionItem = document.createElement("option"); 170 var optionItem = document.createElement("option");
171 var items = this._items; 171 var items = this._items;
172 var len = items.length; 172 var len = items.length;
diff --git a/js/components/core/class-uuid.js b/js/components/core/class-uuid.js
index 9649ea6b..010495e7 100755
--- a/js/components/core/class-uuid.js
+++ b/js/components/core/class-uuid.js
@@ -62,7 +62,7 @@ var Montage = require("montage/core/core").Montage,
62 id[2] = c[(r >>>= 4) & 0xf]; 62 id[2] = c[(r >>>= 4) & 0xf];
63 id[3] = c[(r >>>= 4) & 0xf]; 63 id[3] = c[(r >>>= 4) & 0xf];
64 id[4] = c[(r >>>= 4) & 0xf]; 64 id[4] = c[(r >>>= 4) & 0xf];
65 65
66 return id.join(''); 66 return id.join('');
67 } 67 }
68 } 68 }
diff --git a/js/components/editable.reel/editable.js b/js/components/editable.reel/editable.js
index 026446ab..a0568648 100644
--- a/js/components/editable.reel/editable.js
+++ b/js/components/editable.reel/editable.js
@@ -39,7 +39,7 @@ EDITABLE - Methods
39- startEdit 39- startEdit
40- stopEdit 40- stopEdit
41- value 41- value
42- 42-
43- _suggest 43- _suggest
44- _suggestNext 44- _suggestNext
45- _suggestPrev 45- _suggestPrev
@@ -70,7 +70,7 @@ exports.Editable = Montage.create(Component, {
70 if(this.startOnEvent) { 70 if(this.startOnEvent) {
71 this._element.addEventListener(this.startOnEvent, this, false); 71 this._element.addEventListener(this.startOnEvent, this, false);
72 } 72 }
73 73
74 } 74 }
75 }, 75 },
76 _readOnly : { 76 _readOnly : {
@@ -80,9 +80,9 @@ exports.Editable = Montage.create(Component, {
80 get : function() { return this._readOnly; }, 80 get : function() { return this._readOnly; },
81 set : function(makeReadOnly) { 81 set : function(makeReadOnly) {
82 var action = makeReadOnly ? 'add' : 'remove'; 82 var action = makeReadOnly ? 'add' : 'remove';
83 83
84 this._element.classList[action](this.readOnlyClass); 84 this._element.classList[action](this.readOnlyClass);
85 85
86 if(this.isEditable) { 86 if(this.isEditable) {
87 this.stop(); 87 this.stop();
88 } 88 }
@@ -160,7 +160,7 @@ exports.Editable = Montage.create(Component, {
160 ///// Pre Edit Value 160 ///// Pre Edit Value
161 ///// Value stored when editing starts 161 ///// Value stored when editing starts
162 ///// Useful for reverting to previous value 162 ///// Useful for reverting to previous value
163 163
164 _preEditValue : { 164 _preEditValue : {
165 value : null 165 value : null
166 }, 166 },
@@ -169,26 +169,26 @@ exports.Editable = Montage.create(Component, {
169 if(!this._readOnly) { 169 if(!this._readOnly) {
170 this._isEditable = this._element.contentEditable = true; 170 this._isEditable = this._element.contentEditable = true;
171 this._element.classList.add(this.editingClass); 171 this._element.classList.add(this.editingClass);
172 172
173 ///// Save the preEditValue 173 ///// Save the preEditValue
174 this._preEditValue = this.value; 174 this._preEditValue = this.value;
175 175
176 // Initialize enteredValue with current value 176 // Initialize enteredValue with current value
177 this.enteredValue = this.value; 177 this.enteredValue = this.value;
178 178
179 if(this.selectOnStart) { 179 if(this.selectOnStart) {
180 this.selectAll(); 180 this.selectAll();
181 } 181 }
182 182
183 if(this.stopOnBlur) { 183 if(this.stopOnBlur) {
184 //console.log('adding mousedown event listener'); 184 //console.log('adding mousedown event listener');
185 ///// Simulate blur on editable node by listening to the doc 185 ///// Simulate blur on editable node by listening to the doc
186 document.addEventListener('mousedown', this, false); 186 document.addEventListener('mousedown', this, false);
187 } 187 }
188 188
189 this._sendEvent('start'); 189 this._sendEvent('start');
190 } 190 }
191 191
192 } 192 }
193 }, 193 },
194 stop : { 194 stop : {
@@ -209,7 +209,7 @@ exports.Editable = Montage.create(Component, {