8000 Transform project into es6 · DAB0mB/angular-ecmascript@35c8225 · GitHub
[go: up one dir, main page]
Skip to content

Commit 35c8225

Browse files
DAB0mBDAB0mB
committed
Transform project into es6
1 parent 618c27b commit 35c8225

File tree

14 files changed

+88
-179
lines changed

14 files changed

+88
-179
lines changed

‎src/module-helpers/config.js

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
var Injectable = require('./injectable');
2-
var Utils = require('../utils');
1+
import Injectable from './injectable';
32

4-
function Config() {}
5-
6-
Utils.class(Config, Injectable, {
7-
decorate: function() {
3+
export default class Config extends Injectable {
4+
configure() {
85
throw Error('Config#configure() must be implemented');
96
}
10-
});
11-
12-
module.exports = Config;
7+
}

‎src/module-helpers/controller.js

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
var Injectable = require('./injectable');
2-
var Utils = require('../utils');
1+
import Injectable from './injectable';
2+
import * as Utils from '../utils';
33

4-
function Controller() {
5-
Injectable.apply(this, arguments);
4+
export default class Controller extends Injectable {
5+
constructor(...args) {
6+
super(...args);
67

7-
var createViewModel = this.$scope &&
8-
(this.$scope.$viewModel || this.$scope.viewModel);
8+
const createViewModel = this.$scope &&
9+
(this.$scope.$viewModel || this.$scope.viewModel);
910

10-
if (Utils.isFunction(createViewModel)) {
11-
createViewModel.call(this.$scope, this);
11+
if (Utils.isFunction(createViewModel)) {
12+
createViewModel.call(this.$scope, this);
13+
}
1214
}
13-
}
14-
15-
Utils.class(Controller, Injectable);
16-
17-
module.exports = Controller;
15+
}

‎src/module-helpers/decorator.js

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
var Injectable = require('./injectable');
2-
var Utils = require('../utils');
1+
import Injectable from './injectable';
32

4-
function Decorator() {}
5-
6-
Utils.class(Decorator, Injectable, {
7-
decorate: function() {
3+
export default class Decorator extends Injectable {
4+
decorate() {
85
throw Error('Decorator#decorate() must be implemented');
96
}
10-
});
11-
12-
module.exports = Decorator;
7+
}

‎src/module-helpers/directive.js

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
var Injectable = require('./injectable');
2-
v F438 ar Utils = require('../utils');
1+
import Injectable from './injectable';
32

4-
function Directive() {}
5-
6-
Utils.class(Directive, Injectable, {
7-
compile: function() {
3+
export default class Directive extends Injectable {
4+
compile() {
85
return this.link.bind(this);
96
}
10-
});
11-
12-
module.exports = Directive;
7+
}

‎src/module-helpers/factory.js

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
var Injectable = require('./injectable');
2-
var Utils = require('../utils');
1+
import Injectable from './injectable';
32

4-
function Factory() {}
5-
6-
Utils.class(Factory, Injectable, {
7-
decorate: function() {
3+
export default class Factory extends Injectable {
4+
create() {
85
throw Error('Factory#create() must be implemented');
96
}
10-
});
11-
12-
module.exports = Factory;
7+
}

‎src/module-helpers/filter.js

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
var Injectable = require('./injectable');
2-
var Utils = require('../utils');
1+
import Injectable from './injectable';
32

4-
function Filter() {}
5-
6-
Utils.class(Filter, Injectable, {
7-
decorate: function() {
3+
export default class Filter extends Injectable {
4+
filter() {
85
throw Error('Filter#filter() must be implemented');
96
}
10-
});
11-
12-
module.exports = Filter;
7+
}

‎src/module-helpers/index.js

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
module.exports = {
2-
Injectable: require('./injectable'),
3-
Directive: require('./directive'),
4-
Controller: require('./controller'),
5-
Filter: require('./filter'),
6-
Config: require('./config'),
7-
Factory: require('./factory'),
8-
Service: require('./service'),
9-
Provider: require('./provider'),
10-
Runner: require('./runner'),
11-
Decorator: require('./decorator')
12-
};
1+
export Injectable from './injectable';
2+
export Directive from './directive';
3+
export Controller from './controller';
4+
export Filter from './filter';
5+
export Config from './config';
6+
export Factory from './factory';
7+
export Service from './service';
8+
export Provider from './provider';
9+
export Runner from './runner';
10+
export Decorator from './decorator';

‎src/module-helpers/injectable.js

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
function Injectable() {
2-
var self = this;
3-
var args = arguments;
4-
5-
self.constructor.$inject.forEach(function(name, i) {
6-
self[name] = args[i];
7-
});
8-
}
9-
10-
module.exports = Injectable;
1+
export default class Injectable {
2+
constructor(...args) {
3+
this.constructor.$inject.forEach((name, i) => {
4+
this[name] = args[i];
5+
});
6+
}
7+
}

‎src/module-helpers/provider.js

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
var Injectable = require('./injectable');
2-
var Utils = require('../utils');
1+
import Injectable from './injectable';
32

4-
function Provider() {}
5-
6-
Utils.class(Provider, Injectable, {
7-
$get: function() {
3+
export default class Provider extends Injectable {
4+
$get() {
85
throw Error('Provider#$get() must be implemented');
96
}
10-
});
11-
12-
module.exports = Provider;
7+
}

‎src/module-helpers/runner.js

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
var Injectable = require('./injectable');
2-
var Utils = require('../utils');
1+
import Injectable from './injectable';
32

4-
function Runner() {}
5-
6-
Utils.class(Runner, Injectable, {
7-
decorate: function() {
3+
export default class Runner extends Injectable {
4+
run() {
85
throw Error('Runner#run() must be implemented');
96
}
10-
});
11-
12-
module.exports = Runner;
7+
}

0 commit comments

Comments
 (0)
0