Skip to content
Snippets Groups Projects
Commit 99d2c3c8 authored by Mathis Neumann's avatar Mathis Neumann
Browse files

update ember version

parent b712b970
No related branches found
No related tags found
No related merge requests found
import Ember from 'ember';
import Themes from '../utils/visualisation-themes';
const { Service, computed, copy, merge } = Ember;
const { Service, computed, assign } = Ember;
/**
* Stores the settings for visualisations for a user.
......@@ -52,8 +52,7 @@ export default Service.extend({ // TODO: load and save to localstorage
* @readOnly
*/
themeStyle: computed('theme', function() {
const defaultCopy = copy(Themes.iObserve);
return merge(defaultCopy, Themes[this.get('theme')]);
return assign({}, Themes.iObserve, Themes[this.get('theme')]);
}),
/**
* List of available themes.
......
{
"name": "iobserve-ui",
"dependencies": {
"ember": "~2.4.1",
"ember": "2.7.0",
"ember-cli-shims": "0.1.0",
"ember-cli-test-loader": "0.2.2",
"ember-qunit-notifications": "0.1.0",
......@@ -10,5 +10,8 @@
"bootstrap-sass": "^3.3.6",
"Flot": "flot#^0.8.3",
"flot-axislabels": "https://github.com/markrcote/flot-axislabels.git"
},
"resolutions": {
"ember": "2.7.0"
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment