verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 58 Releases Wiki Activity

refactor watcher

This commit is contained in:
Daniel Herrero 2018-01-09 13:49:15 +01:00
parent d245f7c4f2
commit b1afc20b95
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/core/src/watcher/watcher.js
View File

@ -12,12 +12,13 @@ import isFullEmpty from '../lib/fullEmpty';
* properties are provided.
*/
export default class Watcher extends Component {
constructor($element, $scope, $state, $transitions, $http, vnApp, $translate) {
constructor($element, $scope, $state, $transitions, $http, vnApp, $translate, $attrs) {
super($element);
this.$scope = $scope;
this.$state = $state;
this.$http = $http;
this.$translate = $translate;
this.$attrs = $attrs;
this.vnApp = vnApp;
this.state = null;
@ -93,7 +94,7 @@ export default class Watcher extends Component {
(resolve, reject) => this.noChanges(reject)
);
}
let changedData = getModifiedData(this.data, this.orgData);
let changedData = this.$attrs.save === 'post' ? this.copyInNewObject(this.data) : getModifiedData(this.data, this.orgData);
if (this.save) {
this.save.model = changedData; // this.copyInNewObject(changedData);
@ -194,7 +195,7 @@ export default class Watcher extends Component {
}
}
Watcher.$inject = ['$element', '$scope', '$state', '$transitions', '$http', 'vnApp', '$translate'];
Watcher.$inject = ['$element', '$scope', '$state', '$transitions', '$http', 'vnApp', '$translate', '$attrs'];
module.component('vnWatcher', {
template: require('./watcher.html'),

6
client/core/src/watcher/watcher.spec.js
View File

@ -11,6 +11,7 @@ describe('Component vnWatcher', () => {
let vnApp;
let $translate;
let controller;
let $attrs;
beforeEach(() => {
angular.mock.module('client');
@ -25,7 +26,10 @@ describe('Component vnWatcher', () => {
$transitions = _$transitions_;
$httpBackend = _$httpBackend_;
$translate = _$translate_;
controller = $componentController('vnWatcher', {$scope, $element, $state, vnApp, $transitions, $httpBackend, $translate});
$attrs = {
save: "patch"
};
controller = $componentController('vnWatcher', {$scope, $element, $state, vnApp, $transitions, $httpBackend, $translate, $attrs});
}));
describe('$onInit()', () => {