application/js/progress.js in spontaneous-0.2.0.beta5 vs application/js/progress.js in spontaneous-0.2.0.beta6

- old
+ new

@@ -1,13 +1,13 @@ // console.log('Loading Progress...'); Spontaneous.Progress = (function($, S) { var Progress = function(parent, size, options) { var defaults = { - spinner_fg_color: "#000000", // colour + spinner_fg_color: '#000000', // colour spinner_bg_color: null, // null or false for transparent - progress_fg_color: "#000000", // colour + progress_fg_color: '#000000', // colour progress_bg_color: false, // null or false for transparent spinner_alpha: 1, progress_alpha: 1, period: 550, // (ms) time taken for spinner to complete one revolution segments: 12, // number of bars in spinner @@ -21,11 +21,11 @@ var settings = {}; for (var k in defaults) { settings[k] = defaults[k]; } - for (var k in options) { + for (k in options) { settings[k] = options[k]; } return { container: parent, size: size, @@ -49,11 +49,11 @@ var c = t + '_' + l + '_color'; if (typeof alpha == 'undefined') alpha = this.options[t+'_alpha']; if (!this._color[c]) { this._color[c] = this._parse_color(this.options[c]); } - return "rgba("+this._color[c][0]+", "+this._color[c][1]+", "+this._color[c][2]+", " +alpha+ ")"; + return 'rgba('+this._color[c][0]+', '+this._color[c][1]+', '+this._color[c][2]+', ' +alpha+ ')'; }, canvas: function() { var c; if (this.container && !this._canvas) { @@ -169,11 +169,11 @@ var inc = this._spin_increment(); ctx.clearRect(0,0,this.size,this.size); var r1 = radius - (radius * this.options.segment_length); - var p = ((2.0 * Math.PI * r1) / this.options.segments) * this.options.segment_width ; + var p = ((2.0 * Math.PI * r1) / this.options.segments) * this.options.segment_width; var r2 = radius; if (this.options.rounded) r2 -= p/2; for (var i = 0; i < this.options.segments; i++) { @@ -354,6 +354,6 @@ } } }; }; return Progress; -})(jQuery, Spontaneous); \ No newline at end of file +})(jQuery, Spontaneous);