Permalink
Browse files

Merged master, added a temporary background picker fix for this branch

The background picker relies on the CSS being loaded before it can correctly lay out its components.  Unfortunately the CSS plugin does not correctly build the CSS dependencies so they often load after the javascript has executed.  Added an inline style to the background picker until the CSS loader has been fixed.
  • Loading branch information...
1 parent e381877 commit f8a0c4b508eeb8a47366a408ed4ee8e79e3a225e @tantaman committed May 27, 2012
@@ -49,6 +49,10 @@ define(["vendor/backbone",
@$gradientPicker = @$el.find(".gradientPicker")
@$gradientPreview = @$el.find(".gradientPreview")
+ # TODO: this is a temp hack until we get the CSS plugin
+ # building correctly.
+ @$gradientPicker.css("width", 250)
+
bgOpts = @options.bgOpts or {}
bgOpts.change = (points, styles) =>
@_updateGradientPreview(styles)
Oops, something went wrong.
@@ -50,6 +50,7 @@ define(["vendor/backbone", "./Templates", "css!./res/css/BackgroundPicker.css"],
this.$el.modal();
this.$gradientPicker = this.$el.find(".gradientPicker");
this.$gradientPreview = this.$el.find(".gradientPreview");
+ this.$gradientPicker.css("width", 250);
bgOpts = this.options.bgOpts || {};
bgOpts.change = function(points, styles) {
return _this._updateGradientPreview(styles);

0 comments on commit f8a0c4b

Please sign in to comment.