diff options
author | Nivesh Rajbhandari | 2012-07-02 09:23:13 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-07-02 09:23:13 -0700 |
commit | 2bae1b3148233288ec0bc50876935bdfea1f288c (patch) | |
tree | 686fa3b5b9615941bb7013f35c91e8f326b049db /js/components | |
parent | 2da05a4c71bfe9b136384d9e94fbfbef19f24550 (diff) | |
parent | 12de4e49a309e210c13eb40b2ffa158ef2eb54a7 (diff) | |
download | ninja-2bae1b3148233288ec0bc50876935bdfea1f288c.tar.gz |
Merge branch 'refs/heads/ninja-internal' into MaterialsUI
Diffstat (limited to 'js/components')
9 files changed, 24 insertions, 19 deletions
diff --git a/js/components/gradientpicker.reel/gradientpicker.js b/js/components/gradientpicker.reel/gradientpicker.js index 6071f3c6..f912eb51 100755 --- a/js/components/gradientpicker.reel/gradientpicker.js +++ b/js/components/gradientpicker.reel/gradientpicker.js | |||
@@ -43,7 +43,7 @@ exports.GradientPicker = Montage.create(Component, { | |||
43 | get: function() {return this._mode;}, | 43 | get: function() {return this._mode;}, |
44 | set: function(value) { | 44 | set: function(value) { |
45 | // | 45 | // |
46 | this.application.ninja.colorController.colorPopupManager.hideColorChipPopup(); | 46 | this.application.ninja.colorController.colorPopupManager.hideGradientChipPopup(); |
47 | // | 47 | // |
48 | this._mode = value; | 48 | this._mode = value; |
49 | // | 49 | // |
@@ -132,7 +132,7 @@ exports.GradientPicker = Montage.create(Component, { | |||
132 | value: function(data, silent) { | 132 | value: function(data, silent) { |
133 | if (this.application.ninja.colorController.colorPopupManager) { | 133 | if (this.application.ninja.colorController.colorPopupManager) { |
134 | //Hiding any open popups (of gradient buttons) | 134 | //Hiding any open popups (of gradient buttons) |
135 | this.application.ninja.colorController.colorPopupManager.hideColorChipPopup(); | 135 | this.application.ninja.colorController.colorPopupManager.hideGradientChipPopup(); |
136 | //Creating stop elements | 136 | //Creating stop elements |
137 | var stop = document.createElement('div'), | 137 | var stop = document.createElement('div'), |
138 | holder = document.createElement('div'), | 138 | holder = document.createElement('div'), |
@@ -147,6 +147,7 @@ exports.GradientPicker = Montage.create(Component, { | |||
147 | stop.addEventListener('mouseup', this, false); | 147 | stop.addEventListener('mouseup', this, false); |
148 | //Storing refereces to buttons and actual stop container | 148 | //Storing refereces to buttons and actual stop container |
149 | button.stop = stop; | 149 | button.stop = stop; |
150 | tooltip.stop = stop; | ||
150 | stop.button = button; | 151 | stop.button = button; |
151 | //Adding stop to container | 152 | //Adding stop to container |
152 | this.trackChips.appendChild(stop); | 153 | this.trackChips.appendChild(stop); |
@@ -160,7 +161,7 @@ exports.GradientPicker = Montage.create(Component, { | |||
160 | //Initialing button with color data | 161 | //Initialing button with color data |
161 | button.color(data.color.mode, data.color.value); | 162 | button.color(data.color.mode, data.color.value); |
162 | //Button popup data | 163 | //Button popup data |
163 | button.props = {side: 'top', align: 'center', nocolor: false, wheel: true, palette: true, gradient: false, image: false, offset: -84, panel: true}; | 164 | button.props = {side: 'top', align: 'center', nocolor: false, wheel: true, palette: false, gradient: false, image: false, offset: -84, gradientPopup: true, history: false}; |
164 | //Listening for color events from button | 165 | //Listening for color events from button |
165 | button.addEventListener('change', this, false); | 166 | button.addEventListener('change', this, false); |
166 | //Dispatching event depending on type of mode | 167 | //Dispatching event depending on type of mode |
@@ -263,7 +264,7 @@ exports.GradientPicker = Montage.create(Component, { | |||
263 | // | 264 | // |
264 | this._updating = true; | 265 | this._updating = true; |
265 | // | 266 | // |
266 | this.application.ninja.colorController.colorPopupManager.hideColorChipPopup(); | 267 | this.application.ninja.colorController.colorPopupManager.hideGradientChipPopup(); |
267 | // | 268 | // |
268 | if (e._event.y > this._trackData.y+70 || e._event.y < this._trackData.y) { | 269 | if (e._event.y > this._trackData.y+70 || e._event.y < this._trackData.y) { |
269 | this.removeStop(this.currentStop); | 270 | this.removeStop(this.currentStop); |
diff --git a/js/components/layout/stage-mode.reel/stage-mode.js b/js/components/layout/stage-mode.reel/stage-mode.js index cb42276b..b772d688 100755 --- a/js/components/layout/stage-mode.reel/stage-mode.js +++ b/js/components/layout/stage-mode.reel/stage-mode.js | |||
@@ -9,17 +9,17 @@ var Montage = require("montage/core/core").Montage, | |||
9 | 9 | ||
10 | exports.StageMode = Montage.create(Component, { | 10 | exports.StageMode = Montage.create(Component, { |
11 | 11 | ||
12 | _livePreview: { | 12 | _chromePreview: { |
13 | value: null | 13 | value: null |
14 | }, | 14 | }, |
15 | 15 | ||
16 | livePreview: { | 16 | chromePreview: { |
17 | get: function() { | 17 | get: function() { |
18 | return this._livePreview; | 18 | return this._chromePreview; |
19 | }, | 19 | }, |
20 | set: function(value) { | 20 | set: function(value) { |
21 | if(value !== this._livePreview) { | 21 | if(value !== this._chromePreview) { |
22 | this._livePreview = value; | 22 | this._chromePreview = value; |
23 | this.needsDraw = true; | 23 | this.needsDraw = true; |
24 | } | 24 | } |
25 | } | 25 | } |
@@ -46,7 +46,7 @@ exports.StageMode = Montage.create(Component, { | |||
46 | 46 | ||
47 | handleClick: { | 47 | handleClick: { |
48 | value: function(event) { | 48 | value: function(event) { |
49 | this.livePreview = !this.livePreview; | 49 | this.chromePreview = !this.chromePreview; |
50 | } | 50 | } |
51 | } | 51 | } |
52 | }); \ No newline at end of file | 52 | }); \ No newline at end of file |
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.js b/js/components/tools-properties/brush-properties.reel/brush-properties.js index 1af128af..d1f97260 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.js +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.js | |||
@@ -74,7 +74,7 @@ var BrushProperties = exports.BrushProperties = Montage.create(ToolProperties, { | |||
74 | Object.getPrototypeOf(BrushProperties).draw.call(this); | 74 | Object.getPrototypeOf(BrushProperties).draw.call(this); |
75 | 75 | ||
76 | if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { | 76 | if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { |
77 | this._fillColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; | 77 | this._fillColorCtrl.props = {side: 'top', align: 'left', wheel: true, palette: true, gradient: true, image: false, nocolor: true, offset: 8}; |
78 | this.application.ninja.colorController.addButton("chip", this._fillColorCtrl); | 78 | this.application.ninja.colorController.addButton("chip", this._fillColorCtrl); |
79 | 79 | ||
80 | this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false); | 80 | this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false); |
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.js b/js/components/tools-properties/fill-properties.reel/fill-properties.js index ef1699af..11dec294 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.js +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.js | |||
@@ -60,7 +60,7 @@ var FillProperties = exports.FillProperties = Montage.create(ToolProperties, { | |||
60 | Object.getPrototypeOf(FillProperties).draw.call(this); | 60 | Object.getPrototypeOf(FillProperties).draw.call(this); |
61 | 61 | ||
62 | if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { | 62 | if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { |
63 | this._fillColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; | 63 | this._fillColorCtrl.props = {side: 'top', align: 'left', wheel: true, palette: true, gradient: true, image: false, nocolor: true, offset: 8}; |
64 | this.application.ninja.colorController.addButton("chip", this._fillColorCtrl); | 64 | this.application.ninja.colorController.addButton("chip", this._fillColorCtrl); |
65 | 65 | ||
66 | this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false); | 66 | this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false); |
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js index 25823d11..9ae7c5bc 100755 --- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js +++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js | |||
@@ -100,7 +100,7 @@ var InkBottleProperties = exports.InkBottleProperties = Montage.create(ToolPrope | |||
100 | 100 | ||
101 | if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { | 101 | if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { |
102 | // setup stroke color | 102 | // setup stroke color |
103 | this._strokeColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; | 103 | this._strokeColorCtrl.props = {side: 'top', align: 'left', wheel: true, palette: true, gradient: true, image: false, nocolor: true, offset: 8}; |
104 | this.application.ninja.colorController.addButton("chip", this._strokeColorCtrl); | 104 | this.application.ninja.colorController.addButton("chip", this._strokeColorCtrl); |
105 | 105 | ||
106 | this._strokeColorCtrl.addEventListener("change", this.handleStrokeColorChange.bind(this), false); | 106 | this._strokeColorCtrl.addEventListener("change", this.handleStrokeColorChange.bind(this), false); |
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.js b/js/components/tools-properties/pen-properties.reel/pen-properties.js index 78065b99..4f7e3474 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.js +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.js | |||
@@ -111,11 +111,11 @@ var PenProperties = exports.PenProperties = Montage.create(ToolProperties, { | |||
111 | 111 | ||
112 | if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { | 112 | if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { |
113 | // setup fill color | 113 | // setup fill color |
114 | this._fillColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; | 114 | this._fillColorCtrl.props = {side: 'top', align: 'center', wheel: true, palette: true, gradient: true, image: false, nocolor: true, offset: -80}; |
115 | this.application.ninja.colorController.addButton("chip", this._fillColorCtrl); | 115 | this.application.ninja.colorController.addButton("chip", this._fillColorCtrl); |
116 | 116 | ||
117 | // setup stroke color | 117 | // setup stroke color |
118 | this._strokeColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; | 118 | this._strokeColorCtrl.props = {side: 'top', align: 'center', wheel: true, palette: true, gradient: true, image: false, nocolor: true, offset: -80}; |
119 | this.application.ninja.colorController.addButton("chip", this._strokeColorCtrl); | 119 | this.application.ninja.colorController.addButton("chip", this._strokeColorCtrl); |
120 | 120 | ||
121 | this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false); | 121 | this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false); |
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.js b/js/components/tools-properties/shape-properties.reel/shape-properties.js index 7306275a..e6b71f95 100755 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.js +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.js | |||
@@ -125,11 +125,11 @@ var ShapeProperties = exports.ShapeProperties = Montage.create(ToolProperties, { | |||
125 | 125 | ||
126 | if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { | 126 | if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { |
127 | // setup fill color | 127 | // setup fill color |
128 | this._fillColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; | 128 | this._fillColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: true, image: false, nocolor: true, offset: -80 }; |
129 | this.application.ninja.colorController.addButton("chip", this._fillColorCtrl); | 129 | this.application.ninja.colorController.addButton("chip", this._fillColorCtrl); |