diff options
Diffstat (limited to 'js/controllers/color-controller.js')
-rwxr-xr-x | js/controllers/color-controller.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js index 194b7153..8be2421f 100755 --- a/js/controllers/color-controller.js +++ b/js/controllers/color-controller.js | |||
@@ -27,7 +27,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |||
27 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 27 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
28 | POSSIBILITY OF SUCH DAMAGE. | 28 | POSSIBILITY OF SUCH DAMAGE. |
29 | </copyright> */ | 29 | </copyright> */ |
30 | 30 | ||
31 | //////////////////////////////////////////////////////////////////////// | 31 | //////////////////////////////////////////////////////////////////////// |
32 | // | 32 | // |
33 | var Montage = require("montage/core/core").Montage, | 33 | var Montage = require("montage/core/core").Montage, |
@@ -163,7 +163,7 @@ exports.ColorController = Montage.create(Component, { | |||
163 | // | 163 | // |
164 | getBorder: { | 164 | getBorder: { |
165 | value: function (element) { | 165 | value: function (element) { |
166 | 166 | ||
167 | } | 167 | } |
168 | }, | 168 | }, |
169 | //////////////////////////////////////////////////////////////////// | 169 | //////////////////////////////////////////////////////////////////// |
@@ -262,14 +262,14 @@ exports.ColorController = Montage.create(Component, { | |||
262 | c = this.parseCssToColor('rgb('+temp[0]+')'); | 262 | c = this.parseCssToColor('rgb('+temp[0]+')'); |
263 | gradient.stops.push({css: c.css, value: c.value, mode: c.mode, position: parseInt(temp[1].replace(/\%/i, ""))}); | 263 | gradient.stops.push({css: c.css, value: c.value, mode: c.mode, position: parseInt(temp[1].replace(/\%/i, ""))}); |
264 | } else if (css.indexOf('rgba') >= 0) { | 264 | } else if (css.indexOf('rgba') >= 0) { |
265 | 265 | ||
266 | temp = arr[j].split('rgba'); | 266 | temp = arr[j].split('rgba'); |
267 | temp = temp[1].replace(/\(/i, ""); | 267 | temp = temp[1].replace(/\(/i, ""); |
268 | temp = temp.split(')'); | 268 | temp = temp.split(')'); |
269 | c = this.parseCssToColor('rgba('+temp[0]+')'); | 269 | c = this.parseCssToColor('rgba('+temp[0]+')'); |
270 | gradient.stops.push({css: c.css, value: c.value, mode: c.mode, position: parseInt(temp[1].replace(/\%/i, ""))}); | 270 | gradient.stops.push({css: c.css, value: c.value, mode: c.mode, position: parseInt(temp[1].replace(/\%/i, ""))}); |
271 | } | 271 | } |
272 | } | 272 | } |
273 | } else if (css.indexOf('-webkit-gradient') >= 0) { | 273 | } else if (css.indexOf('-webkit-gradient') >= 0) { |
274 | //Linear gradient | 274 | //Linear gradient |
275 | gradient.stops = []; | 275 | gradient.stops = []; |