aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Reid2012-03-09 16:47:26 -0800
committerJon Reid2012-03-09 16:47:26 -0800
commitbe59c44f9232104ded1a9c4cd888d70021eba33e (patch)
treeb94c8432759362e035f15c0936c575a2861b6ad8
parent54b31ecbd4c9877183850542227c61946a62aa4f (diff)
parenta28cb88194f45325e42dd8c774469424712dd6f4 (diff)
downloadninja-be59c44f9232104ded1a9c4cd888d70021eba33e.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-local
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.js2
-rwxr-xr-xjs/controllers/color-controller.js4
-rwxr-xr-xjs/panels/Color/colorpanelpopup.reel/colorpanelpopup.js13
-rwxr-xr-xnode_modules/montage/bin/montage3
-rwxr-xr-xnode_modules/montage/core/core.js20
-rwxr-xr-xnode_modules/montage/core/deserializer.js115
-rwxr-xr-xnode_modules/montage/core/serializer.js45
-rwxr-xr-xnode_modules/montage/montage.js68
-rw-r--r--node_modules/montage/node.js140
-rwxr-xr-xnode_modules/montage/package.json33
-rwxr-xr-xnode_modules/montage/require/browser.js90
-rw-r--r--node_modules/montage/require/node.js49
-rwxr-xr-xnode_modules/montage/require/require.js205
-rwxr-xr-xnode_modules/montage/ui/application.js4
-rw-r--r--node_modules/montage/ui/bluemoon/progress.reel/progress.js20
-rw-r--r--node_modules/montage/ui/check-input.js2
-rw-r--r--node_modules/montage/ui/checkbox.reel/checkbox.js2
-rwxr-xr-xnode_modules/montage/ui/component.js115
-rw-r--r--node_modules/montage/ui/composer/press-composer.js9
-rw-r--r--node_modules/montage/ui/composer/translate-composer.js77
-rwxr-xr-xnode_modules/montage/ui/condition.reel/condition.js24
-rwxr-xr-xnode_modules/montage/ui/controller/array-controller.js8
-rwxr-xr-xnode_modules/montage/ui/list.reel/list.html10
-rwxr-xr-xnode_modules/montage/ui/loader.reel/loader.js6
-rwxr-xr-xnode_modules/montage/ui/loading-panel.reel/loading-panel.css38
-rwxr-xr-xnode_modules/montage/ui/loading-panel.reel/loading-panel.html6
-rw-r--r--node_modules/montage/ui/native-control.js3
-rwxr-xr-xnode_modules/montage/ui/popup/confirm.reel/confirm.js4
-rwxr-xr-xnode_modules/montage/ui/popup/popup.reel/popup.js159
-rwxr-xr-xnode_modules/montage/ui/progress.reel/progress.css51
-rwxr-xr-xnode_modules/montage/ui/progress.reel/progress.html32
-rwxr-xr-xnode_modules/montage/ui/progress.reel/progress.js144
-rwxr-xr-xnode_modules/montage/ui/progress.reel/rule.pngbin956 -> 0 bytes
-rwxr-xr-xnode_modules/montage/ui/progress.reel/scroll.pngbin272 -> 0 bytes
-rwxr-xr-xnode_modules/montage/ui/radio-button.reel/radio-button.js3
-rwxr-xr-xnode_modules/montage/ui/repetition.reel/repetition.js127
-rwxr-xr-xnode_modules/montage/ui/scroll.js820
-rw-r--r--node_modules/montage/ui/scroller.reel/scroller.html1
-rw-r--r--node_modules/montage/ui/scroller.reel/scroller.js36
-rw-r--r--node_modules/montage/ui/select-input.reel/select-input.js115
-rw-r--r--node_modules/montage/ui/skeleton/range-input.reel/range-input.css27
-rw-r--r--node_modules/montage/ui/skeleton/range-input.reel/range-input.html62
-rw-r--r--node_modules/montage/ui/skeleton/range-input.reel/range-input.js234
-rwxr-xr-xnode_modules/montage/ui/slot.reel/slot.js19
-rwxr-xr-xnode_modules/montage/ui/template.js4
-rw-r--r--node_modules/montage/ui/text-input.js16
-rw-r--r--node_modules/montage/ui/textarea.reel/textarea.js2
-rw-r--r--node_modules/montage/ui/toggle-button.reel/toggle-button.js9
-rwxr-xr-xnode_modules/montage/ui/toggle-switch.reel/toggle-switch.css162
-rwxr-xr-xnode_modules/montage/ui/toggle-switch.reel/toggle-switch.html16
-rw-r--r--node_modules/montage/ui/toggle-switch.reel/toggle-switch.js424
51 files changed, 2007 insertions, 1571 deletions
diff --git a/js/components/gradientpicker.reel/gradientpicker.js b/js/components/gradientpicker.reel/gradientpicker.js
index 0940be3c..da4e8c0f 100755
--- a/js/components/gradientpicker.reel/gradientpicker.js
+++ b/js/components/gradientpicker.reel/gradientpicker.js
@@ -397,7 +397,7 @@ exports.GradientPicker = Montage.create(Component, {
397 actionEvent.initEvent(type, true, true); 397 actionEvent.initEvent(type, true, true);
398 actionEvent.type = type; 398 actionEvent.type = type;
399 actionEvent.wasSetByCode = userInitiated; 399 actionEvent.wasSetByCode = userInitiated;
400 actionEvent.gradient = {stops: this.value, mode: this.mode, css: css}; 400 actionEvent.gradient = {stops: this.value, mode: this.mode, gradientMode: this.mode, css: css};
401 this.dispatchEvent(actionEvent); 401 this.dispatchEvent(actionEvent);
402 } 402 }
403 } 403 }
diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js
index a6e41dd3..53573baf 100755
--- a/js/controllers/color-controller.js
+++ b/js/controllers/color-controller.js
@@ -259,6 +259,7 @@ exports.ColorController = Montage.create(Component, {
259 //Radial gradient 259 //Radial gradient
260 gradient.stops = []; 260 gradient.stops = [];
261 gradient.mode = 'radial'; 261 gradient.mode = 'radial';
262 gradient.gradientMode = 'radial';
262 gradient.css = css; 263 gradient.css = css;
263 // 264 //
264 arr = css.split('%,'); 265 arr = css.split('%,');
@@ -284,6 +285,7 @@ exports.ColorController = Montage.create(Component, {
284 //Linear gradient 285 //Linear gradient
285 gradient.stops = []; 286 gradient.stops = [];
286 gradient.mode = 'linear'; 287 gradient.mode = 'linear';
288 gradient.gradientMode = 'linear';
287 gradient.css = css; 289 gradient.css = css;
288 // 290 //
289 arr = css.split('from('); 291 arr = css.split('from(');
@@ -317,7 +319,7 @@ exports.ColorController = Montage.create(Component, {
317 } 319 }
318 } 320 }
319 //Creating gradient object 321 //Creating gradient object
320 color = {mode: 'gradient', value: {stops: gradient.stops, mode: gradient.mode, css: css}}; 322 color = {mode: 'gradient', value: {stops: gradient.stops, mode: gradient.mode, gradientMode: gradient.gradientMode, css: css}};
321 } else if (css){ 323 } else if (css){
322 //Simple solid color 324 //Simple solid color
323 color = this.parseCssToColor(css); 325 color = this.parseCssToColor(css);
diff --git a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
index 299e603d..3eae3ea3 100755
--- a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
+++ b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
@@ -379,11 +379,16 @@ exports.ColorPanelPopup = Montage.create(Component, {
379 gradient.element = container; 379 gradient.element = container;
380 gradient.hack = this.hack; // TODO: Remove 380 gradient.hack = this.hack; // TODO: Remove
381 // 381 //
382 if (g && g.value && g.value.stops && g.value.mode) { 382 if (g && g.value && g.value.stops) {
383 gradient._mode = g.value.mode; 383 if (g.value.gradientMode) {
384 gradient.value = g.value.stops; 384 gradient._mode = g.value.gradientMode;
385 gradient.value = g.value.stops;
386 } else {
387 gradient._mode = 'linear';
388 gradient.value = g.value.stops;
389 }
385 } else { 390 } else {
386 gradient._mode = this.defaultGradient.mode; 391 gradient._mode = this.defaultGradient.gradientMode;
387 gradient.value = this.defaultGradient.stops; 392 gradient.value = this.defaultGradient.stops;
388 } 393 }
389 // 394 //
diff --git a/node_modules/montage/bin/montage b/node_modules/montage/bin/montage
new file mode 100755
index 00000000..aaa84003
--- /dev/null
+++ b/node_modules/montage/bin/montage
@@ -0,0 +1,3 @@
1#!/usr/bin/env node
2// --harmony_weakmaps --harmony_proxies
3require("../montage.js").initMontage();
diff --git a/node_modules/montage/core/core.js b/node_modules/montage/core/core.js
index ff94f303..8fcf7977 100755
--- a/node_modules/montage/core/core.js
+++ b/node_modules/montage/core/core.js
@@ -71,14 +71,14 @@ Object.defineProperty(M, "create", {
71 71
72 var newObject = Object.create(typeof aPrototype === "undefined" ? this : aPrototype); 72 var newObject = Object.create(typeof aPrototype === "undefined" ? this : aPrototype);
73 73
74 if (typeof newObject.didCreate === "function") {
75 newObject.didCreate();
76 }
77
78 if (newObject._dependenciesForProperty) { 74 if (newObject._dependenciesForProperty) {
79 newObject._dependencyListeners = {}; 75 newObject._dependencyListeners = {};
80 } 76 }
81 77
78 if (typeof newObject.didCreate === "function") {
79 newObject.didCreate();
80 }
81
82 return newObject; 82 return newObject;
83 } else { 83 } else {
84 var result = Object.create(aPrototype); 84 var result = Object.create(aPrototype);
@@ -713,13 +713,17 @@ if (!Object.seal) {
713 */ 713 */
714Object.defineProperty(M, "callDelegateMethod", { 714Object.defineProperty(M, "callDelegateMethod", {
715 value: function(name) { 715 value: function(name) {
716 var delegate, delegateFunctionName, delegateFunction; 716 var delegate = this.delegate, delegateFunctionName, delegateFunction;
717 if (typeof this.identifier === "string") { 717 if (typeof this.identifier === "string") {
718 delegateFunctionName = this.identifier + name.toCapitalized(); 718 delegateFunctionName = this.identifier + name.toCapitalized();
719 } else { 719 if (delegate && typeof (delegateFunction = delegate[delegateFunctionName]) === "function") {
720 delegateFunctionName = name; 720 // remove first argument
721 Array.prototype.shift.call(arguments);
722 return delegateFunction.apply(delegate, arguments);
723 }
721 } 724 }
722 if ((delegate = this.delegate) && typeof (delegateFunction = delegate[delegateFunctionName]) === "function") { 725
726 if (delegate && typeof (delegateFunction = delegate[name]) === "function") {
723 // remove first argument 727 // remove first argument
724 Array.prototype.shift.call(arguments); 728 Array.prototype.shift.call(arguments);
725 return delegateFunction.apply(delegate, arguments); 729 return delegateFunction.apply(delegate, arguments);
diff --git a/node_modules/montage/core/deserializer.js b/node_modules/montage/core/deserializer.js
index 0abc924b..7e812235 100755
--- a/node_modules/montage/core/deserializer.js
+++ b/