Mirrors/VILLASweb
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web/ synced 2025-03-09 00:00:01 +01:00
Code Issues Releases Wiki Activity

Fix jquery-ui dependency

Browse source 
Fix super class init
This commit is contained in:
Markus Grigull 2017-02-04 15:11:41 +01:00
parent 31c3c9bf33
commit 1104bcfec5
7 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/mixins/draggable.js
View file

@ -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();

2
app/mixins/droppable.js
View file

@ -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();

2
app/mixins/live-data.js
View file

@ -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();

2
app/mixins/resizable.js
View file

@ -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();

2
app/mixins/sortable.js
View file

@ -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();

5
ember-cli-build.js
View file

@ -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();
};

3
package.json
View file

@ -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"
},