Fix some ordering

master
William Toohey 9 years ago
parent 2df280e071
commit f5524f3f48
  1. 7
      gulpfile.js
  2. 2
      src/js/HuesCore.js

@ -15,6 +15,13 @@ gulp.task('default', ['css', 'audio', 'minify']);
gulp.task('css', function(){ gulp.task('css', function(){
return gulp.src('src/css/**/*.css') return gulp.src('src/css/**/*.css')
.pipe(order([
// hlwn must come after modern
// modern must come after main
"hues-main.css",
"huesUI-modern.css",
"huesUI-hlwn.css"
]))
.pipe(plumber()) .pipe(plumber())
.pipe(newer('css/hues-min.css')) .pipe(newer('css/hues-min.css'))
.pipe(sourcemaps.init()) .pipe(sourcemaps.init())

@ -219,6 +219,8 @@ function HuesCore(defaults) {
this.clearMessage(); this.clearMessage();
setInterval(this.loopCheck.bind(this), 1000); setInterval(this.loopCheck.bind(this), 1000);
this.renderer = new HuesCanvas(this.root, this.soundManager.context, this); this.renderer = new HuesCanvas(this.root, this.soundManager.context, this);
this.callEventListeners("settingsupdated");
this.settingsUpdated();
this.setColour(this.colourIndex); this.setColour(this.colourIndex);
this.animationLoop(); this.animationLoop();

Loading…
Cancel
Save