From 1104bcfec54e2c1088b79cb3cd14bc3fbd30d319 Mon Sep 17 00:00:00 2001 From: Markus Grigull Date: Sat, 4 Feb 2017 15:11:41 +0100 Subject: [PATCH] Fix jquery-ui dependency Fix super class init --- app/mixins/draggable.js | 2 +- app/mixins/droppable.js | 2 +- app/mixins/live-data.js | 2 +- app/mixins/resizable.js | 2 +- app/mixins/sortable.js | 2 +- ember-cli-build.js | 5 +++++ package.json | 3 +-- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/mixins/draggable.js b/app/mixins/draggable.js index 1edf9f4..811b31e 100644 --- a/app/mixins/draggable.js +++ b/app/mixins/draggable.js @@ -17,7 +17,7 @@ export default Ember.Mixin.create({ uiDragEvents: [ 'create_drag', 'start_drag', 'drag_drag', 'stop_drag' ], didInsertElement() { - this._super.init(); + this._super(); // get available options and events var options = this._gatherDragOptions(); diff --git a/app/mixins/droppable.js b/app/mixins/droppable.js index 203ab21..7e557e8 100644 --- a/app/mixins/droppable.js +++ b/app/mixins/droppable.js @@ -16,7 +16,7 @@ export default Ember.Mixin.create({ 'out_drop', 'drop_drop' ], didInsertElement() { - this._super.init(); + this._super(); // get available options and events var options = this._gatherDropOptions(); diff --git a/app/mixins/live-data.js b/app/mixins/live-data.js index 2ba081e..059c2a4 100644 --- a/app/mixins/live-data.js +++ b/app/mixins/live-data.js @@ -20,7 +20,7 @@ export default Ember.Mixin.create({ _sockets: {}, init: function() { - this._super.init(); + this._super(); // fetch the simulations for the first time this._fetchRunningSimulations(); diff --git a/app/mixins/resizable.js b/app/mixins/resizable.js index 50c1383..28a1073 100644 --- a/app/mixins/resizable.js +++ b/app/mixins/resizable.js @@ -18,7 +18,7 @@ export default Ember.Mixin.create({ uiResizeEvents: [ 'create_resize', 'start_resize', 'resize_resize', 'stop_resize' ], didInsertElement() { - this._super.init(); + this._super(); // get available options and events var options = this._gatherResizeOptions(); diff --git a/app/mixins/sortable.js b/app/mixins/sortable.js index a69d4e8..737367f 100644 --- a/app/mixins/sortable.js +++ b/app/mixins/sortable.js @@ -21,7 +21,7 @@ export default Ember.Mixin.create({ 'sort_sort', 'start_sort', 'stop_sort', 'update_sort' ], didInsertElement() { - this._super.init(); + this._super(); // get available options and events var options = this._gatherSortOptions(); diff --git a/ember-cli-build.js b/ember-cli-build.js index ab8a0ed..3418f9e 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -22,6 +22,11 @@ module.exports = function(defaults) { app.import('bower_components/bootstrap/dist/js/bootstrap.js'); app.import('bower_components/flot/jquery.flot.time.js'); + app.import('bower_components/jquery-ui/jquery-ui.js'); + + app.import('bower_components/jquery-ui/themes/smoothness/jquery-ui.css'); + + app.import('bower_components/jquery-ui/themes/smoothness/images/ui-icons_222222_256x240.png', { destDir: 'assets/images' }); return app.toTree(); }; diff --git a/package.json b/package.json index 4640180..1a3bcb0 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "ember-cli-htmlbars": "^1.1.1", "ember-cli-htmlbars-inline-precompile": "^0.3.3", "ember-cli-inject-live-reload": "^1.4.1", - "ember-cli-jquery-ui": "0.0.20", "ember-cli-jshint": "^2.0.1", "ember-cli-qunit": "^3.0.1", "ember-cli-release": "^0.2.9", @@ -40,10 +39,10 @@ "ember-modal-dialog": "^0.9.0", "ember-resolver": "^2.0.3", "ember-simple-auth": "^1.1.0", + "ember-source": "^2.11.0", "ember-tether": "0.3.1", "ember-truth-helpers": "1.2.0", "ember-uploader": "1.2.3", - "ember-source": "^2.11.0", "ember-welcome-page": "^2.0.2", "loader.js": "^4.0.10" },