aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui
diff options
context:
space:
mode:
Diffstat (limited to 'js/components/ui')
-rw-r--r--js/components/ui/color-chip.reel/color-chip.js16
1 files changed, 0 insertions, 16 deletions
diff --git a/js/components/ui/color-chip.reel/color-chip.js b/js/components/ui/color-chip.reel/color-chip.js
index 4c288084..e51bdd8a 100644
--- a/js/components/ui/color-chip.reel/color-chip.js
+++ b/js/components/ui/color-chip.reel/color-chip.js
@@ -53,19 +53,6 @@ var ColorChip = exports.ColorChip = Montage.create(Component, {
53 this.chipBtn.props = {side: 'right', align: 'top', wheel: true, palette: true, gradient: true, image: true, offset: this.offset}; 53 this.chipBtn.props = {side: 'right', align: 'top', wheel: true, palette: true, gradient: true, image: true, offset: this.offset};
54 this.application.ninja.colorController.addButton(this.mode, this.chipBtn); 54 this.application.ninja.colorController.addButton(this.mode, this.chipBtn);
55 55
56 /*
57 if(this.chip) {
58 //this.application.ninja.colorController.addButton('fillIcon', this.icon);
59 this.chipBtn.props = {side: 'right', align: 'top', wheel: true, palette: true, gradient: true, image: true, offset: 0};
60 this.application.ninja.colorController.addButton(this.mode, this.chipBtn);
61 } else {
62 //if(this.hasIcon) this.application.ninja.colorController.addButton(this.mode + 'Icon', this.icon);
63 this.chipBtn.props = {side: 'right', align: 'top', wheel: true, palette: true, gradient: true, image: true, offset: 20};
64 this.application.ninja.colorController.addButton(this.mode, this.chipBtn);
65 }
66 */
67
68
69 } 56 }
70 }, 57 },
71 58
@@ -76,7 +63,6 @@ var ColorChip = exports.ColorChip = Montage.create(Component, {
76 var mode = "rgb", r = 0, g = 0, b = 0, a = 1, css = "rgb(255,0,0)"; 63 var mode = "rgb", r = 0, g = 0, b = 0, a = 1, css = "rgb(255,0,0)";
77 64
78 if(this.initialColor) { 65 if(this.initialColor) {
79 console.log(this.initialColor);
80 var colorObj = this.application.ninja.colorController.getColorObjFromCss(this.initialColor); 66 var colorObj = this.application.ninja.colorController.getColorObjFromCss(this.initialColor);
81 mode = colorObj.mode; 67 mode = colorObj.mode;
82 r = colorObj.value.r; 68 r = colorObj.value.r;
@@ -87,8 +73,6 @@ var ColorChip = exports.ColorChip = Montage.create(Component, {
87 } 73 }
88 74
89 this.chipBtn.color(mode, {wasSetByCode: true, type: 'change', color: {r: r, g: g, b: b}, css: css}); 75 this.chipBtn.color(mode, {wasSetByCode: true, type: 'change', color: {r: r, g: g, b: b}, css: css});
90 //this.chipBtn.color('rgb', {wasSetByCode: true, type: 'change', color: {r: 255, g: 0, b: 0}, css: 'rgb(255,0,0)'});
91
92 this.chipBtn.addEventListener("change", this, false); 76 this.chipBtn.addEventListener("change", this, false);
93 } 77 }
94 } 78 }