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 minor errors and warnings

Browse source
This commit is contained in:
Markus Grigull 2017-02-01 12:26:41 +01:00
parent 0e83bbd686
commit ec034a57bf
6 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/components/draggable-dropzone.js
View file

@ -30,9 +30,9 @@ export default Ember.Component.extend({
drop(event) {
var data = event.dataTransfer.getData('text/data');
var position = {
x: event.originalEvent.pageX - $(event.target).offset().left - parseFloat(event.dataTransfer.getData('offset/x')),
y: event.originalEvent.pageY - $(event.target).offset().top - parseFloat(event.dataTransfer.getData('offset/y'))
}
x: event.originalEvent.pageX - Ember.$(event.target).offset().left - parseFloat(event.dataTransfer.getData('offset/x')),
y: event.originalEvent.pageY - Ember.$(event.target).offset().top - parseFloat(event.dataTransfer.getData('offset/y'))
};
this.sendAction('dropped', data, position);

4
app/components/draggable-item.js
View file

@ -17,8 +17,8 @@ export default Ember.Component.extend({
draggable: 'true',
dragStart(event) {
event.dataTransfer.setData('offset/x', event.originalEvent.pageX - $(event.target).offset().left);
event.dataTransfer.setData('offset/y', event.originalEvent.pageY - $(event.target).offset().top);
event.dataTransfer.setData('offset/x', event.originalEvent.pageX - Ember.$(event.target).offset().left);
event.dataTransfer.setData('offset/y', event.originalEvent.pageY - Ember.$(event.target).offset().top);
return event.dataTransfer.setData('text/data', get(this, 'content'));
}

1
app/components/file-upload.js
View file

@ -7,7 +7,6 @@
* Unauthorized copying of this file, via any medium is strictly prohibited.
**********************************************************************************/
import Ember from 'ember';
import EmberUploader from 'ember-uploader';
export default EmberUploader.FileField.extend({

5
app/components/widget-image.js
View file

@ -13,8 +13,7 @@ import ENV from '../config/environment';
import EmberUploader from 'ember-uploader';
const {
inject: { service },
RSVP
inject: { service }
} = Ember;
export default WidgetAbstract.extend({
@ -95,7 +94,7 @@ export default WidgetAbstract.extend({
var self = this;
uploader.upload(files).then(event => {
uploader.upload(files).then(function() {
// reload user
var user = self.get('sessionUser.user');
self.get('store').findRecord('user', user.get('id'));

2
app/components/widget-plot.js
View file

@ -84,7 +84,7 @@ export default WidgetAbstract.extend({
// update observer TODO: Only update when (query) changed
let observeQuery = this.get('observeQuery');
if (query != observeQuery) {
if (query !== observeQuery) {
if (observeQuery != null) {
this.removeObserver(observeQuery, this._updateData);
}

2
app/components/widget-table.js
View file

@ -69,7 +69,7 @@ export default WidgetAbstract.extend({
}
// get values from array
let values = this.get('data.' + simulatorId + '.values');
let values = this.get('data.' + this.get('widget.widgetData.simulator') + '.values');
for (let i = 0; i < values.length; i++) {
if (!signals[i]) {
break;