Skip to content

Commit 46afb82

Browse files
petersirkapetersirka
committed
Merge pull request totaljs#27 from totaljs/v1.9.0
v1.9.0
2 parents ce53a6b + ca9f2e2 commit 46afb82

File tree

251 files changed

+714
-1471
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

251 files changed

+714
-1471
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
tmp/
2+
13
# Logs
24
logs
35
*.log

‎0-learn/controllers/api.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
var Users = MODEL('Users');
22

33
exports.install = function() {
4-
F.route('/api/users/', json_users_query);
5-
F.route('/api/users/{id}/', json_users_read);
6-
F.route('/api/users/{id}/', json_users_remove, ['delete']);
7-
F.route('/api/users/', json_users_save, ['put', 'json', '*User']);
4+
F.restful('/api/users/', ['*User'], json_users_query, json_users_read, json_users_remove, json_users_save);
5+
// Is same as:
6+
// F.route('/api/users/', json_users_query);
7+
// F.route('/api/users/{id}/', json_users_read);
8+
// F.route('/api/users/', json_users_save, ['post', '*User']);
9+
// F.route('/api/users/{id}/', json_users_save, ['put', '*User']);
10+
// F.route('/api/users/{id}/', json_users_remove, ['delete']);
811
};
912

1013
function json_users_query() {
@@ -22,7 +25,8 @@ function json_users_remove(id) {
2225
Users.User.remove({ _id: id }, self.callback());
2326
}
2427

25-
function json_users_save() {
28+
function json_users_save(id) {
2629
var self = this;
30+
self.body._id = ObjectID.parse(id);
2731
self.body.$async(self.callback()).$workflow('check').$save();
2832
}

‎angularjs-bootstrap/app/controllers/home.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function HomeCtrl($scope) {
1+
app.controller('HomeCtrl', ['$scope', function($scope) {
22
$scope.name = 'total.js + angular.js = awesome';
33
$scope.users = [{ name: 'Peter', age: 30 }, { name: 'Michal', age: 34 }, { name: 'Lucia', age: 33 }];
4-
}
4+
}])

‎angularjs-bootstrap/app/controllers/user.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
function UserCtrl($scope) {
1+
app.controller('UserCtrl', ['$scope', function($scope) {
22
$scope.name = 'user';
3-
}
3+
}]);

‎angularjs-bootstrap/modules/angular.js

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
// MIT License
2+
// Copyright Peter Širka <petersirka@gmail.com>
23
// Version 1.01
34

45
exports.name = 'angular.js';
5-
exports.version = '1.00';
6-
exports.options = { 'angular-version': '1.2.18', 'angular-i18n-version': '1.2.15' };
6+
exports.version = '1.01';
7+
exports.options = { 'angular-version': '1.3.15', 'angular-i18n-version': '1.3.15' };
78

89
var fs = require('fs');
910
var EXTENSION_JS = '.js';
@@ -13,7 +14,9 @@ var REPOSITORY_ANGULAR_COMMON = '$angular-common';
1314
var REPOSITORY_ANGULAR_CONTROLLER = '$angular-controller';
1415
var REPOSITORY_ANGULAR_OTHER = '$angular-other';
1516

16-
exports.install = function(framework, options) {
17+
exports.install = function() {
18+
19+
var options = framework.version >= 1900 ? arguments[0] : arguments[1];
1720

1821
Utils.extend(exports.options, options, true);
1922

@@ -74,14 +77,14 @@ exports.install = function(framework, options) {
7477

7578
if (length > 1) {
7679
for (var i = 0; i < length; i++)
77-
self.ngCommon.call(self, arguments[i]);
80+
framework.helpers.call(self, arguments[i]);
7881
return '';
7982
}
8083

8184
if (name instanceof Array) {
8285
length = name.length;
8386
for (var i = 0; i < length; i++)
84-
self.ngCommon.call(self, name[i]);
87+
framework.helpers.ngCommon.call(self, name[i]);
8588
return '';
8689
}
8790

@@ -128,7 +131,7 @@ exports.install = function(framework, options) {
128131
if (name.lastIndexOf(EXTENSION_JS) === -1)
129132
extension = EXTENSION_JS;
130133

131-
output += $script_create(isLocal ? '/i18n/angular-locale_' + name + extension : '//cdnjs.cloudflare.com/ajax/libs/angular-i18n/' + exports.options['angular-i18n-version'] + '/angular-locale_' + name + extension);
134+
output += $script_create(isLocal ? '/i18n/angular-locale_' + name + extension : '//cdnjs.cloudflare.com/ajax/libs/angular.js/' + exports.options['angular-i18n-version'] + '/i18n/angular-locale_' + name + extension);
132135
self.repository[REPOSITORY_ANGULAR_LOCALE] = output;
133136

134137
return '';
@@ -404,7 +407,7 @@ exports.install = function(framework, options) {
404407
framework.on('controller-render-head', event_render_head);
405408
};
406409

407-
exports.uninstall = function(framework) {
410+
exports.uninstall = function() {
408411
delete framework.helpers.ng;
409412
delete framework.helpers.ngInclude;
410413
delete framework.helpers.ngResource;
@@ -427,4 +430,4 @@ function event_render_head(controller) {
427430

428431
function $script_create(url) {
429432
return '<script type="text/javascript" src="' + url + '"></script>';
430-
}
433+
}

‎angularjs-bootstrap/readme.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
![TOTALSTACK logo](http://www.totaljs.com/img/totalstack.png)
21
# How to run it?
32

43
## First step

‎angularjs-common/app/controllers/home.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function HomeCtrl($scope) {
1+
app.controller('HomeCtrl', ['$scope', function($scope) {
22
$scope.name = 'total.js + angular.js = awesome';
33
$scope.users = [{ name: 'Peter', age: 30 }, { name: 'Michal', age: 34 }, { name: 'Lucia', age: 33 }];
4-
}
4+
}]);

‎angularjs-common/app/controllers/user.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
function UserCtrl($scope) {
1+
app.controller('UserCtrl', ['$scope', function($scope) {
22
$scope.name = 'user';
3-
}
3+
}]);

‎angularjs-common/controllers/default.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
exports.install = function() {
2-
framework.route('/*', view_app);
2+
F.route('/*', view_app);
33
};
44

55
function view_app() {

‎angularjs-common/definitions/angular.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ var options = {};
44
// options['angular-version'] = '1.2.18';
55
// options['angular-i18n-version'] = '1.2.15';
66

7-
INSTALL('module', 'https://modules.totaljs.com/angular.js/v1.00/angular.js', options);
7+
INSTALL('module', 'https://modules.totaljs.com/angular.js/v1.01/angular.js', options);

‎angularjs-common/modules/angular.js

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
// MIT License
2+
// Copyright Peter Širka <petersirka@gmail.com>
23
// Version 1.01
34

45
exports.name = 'angular.js';
5-
exports.version = '1.00';
6-
exports.options = { 'angular-version': '1.2.18', 'angular-i18n-version': '1.2.15' };
6+
exports.version = '1.01';
7+
exports.options = { 'angular-version': '1.3.15', 'angular-i18n-version': '1.3.15' };
78

89
var fs = require('fs');
910
var EXTENSION_JS = '.js';
@@ -13,7 +14,9 @@ var REPOSITORY_ANGULAR_COMMON = '$angular-common';
1314
var REPOSITORY_ANGULAR_CONTROLLER = '$angular-controller';
1415
var REPOSITORY_ANGULAR_OTHER = '$angular-other';
1516

16-
exports.install = function(framework, options) {
17+
exports.install = function() {
18+
19+
var options = framework.version >= 1900 ? arguments[0] : arguments[1];
1720

1821
Utils.extend(exports.options, options, true);
1922

@@ -74,14 +77,14 @@ exports.install = function(framework, options) {
7477

7578
if (length > 1) {
7679
for (var i = 0; i < length; i++)
77-
self.ngCommon.call(self, arguments[i]);
80+
framework.helpers.call(self, arguments[i]);
7881
return '';
7982
}
8083

8184
if (name instanceof Array) {
8285
length = name.length;
8386
for (var i = 0; i < length; i++)
84-
self.ngCommon.call(self, name[i]);
87+
framework.helpers.ngCommon.call(self, name[i]);
8588
return '';
8689
}
8790

@@ -128,7 +131,7 @@ exports.install = function(framework, options) {
128131
if (name.lastIndexOf(EXTENSION_JS) === -1)
129132
extension = EXTENSION_JS;
130133

131-
output += $script_create(isLocal ? '/i18n/angular-locale_' + name + extension : '//cdnjs.cloudflare.com/ajax/libs/angular-i18n/' + exports.options['angular-i18n-version'] + '/angular-locale_' + name + extension);
134+
output += $script_create(isLocal ? '/i18n/angular-locale_' + name + extension : '//cdnjs.cloudflare.com/ajax/libs/angular.js/' + exports.options['angular-i18n-version'] + '/i18n/angular-locale_' + name + extension);
132135
self.repository[REPOSITORY_ANGULAR_LOCALE] = output;
133136

134137
return '';
@@ -404,7 +407,7 @@ exports.install = function(framework, options) {
404407
framework.on('controller-render-head', event_render_head);
405408
};
406409

407-
exports.uninstall = function(framework) {
410+
exports.uninstall = function() {
408411
delete framework.helpers.ng;
409412
delete framework.helpers.ngInclude;
410413
delete framework.helpers.ngResource;

‎angularjs-common/readme.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
![TOTALSTACK logo](http://www.totaljs.com/img/totalstack.png)
21
# How to run it?
32

43
## First step

‎angularjs-common/tmp/app.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎angularjs-common/tmp/controllers-home.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎angularjs-common/tmp/controllers-user.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎angularjs-common/tmp/css-app.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎angularjs-mongodb-rest-resources/app/controllers/user.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
function UserCtrl($scope, User) {
1+
app.controller('UserCtrl', ['$scope', 'User', function($scope, User) {
22

33
$scope.users = User.query();
44
$scope.isForm = false;
55

6-
$scope.edit = function(id) {
6+
$scope.edit = function(id) {
77
$scope.user = User.get({ id: id });
88
$scope.isForm = true;
99
};
@@ -18,7 +18,7 @@ function UserCtrl($scope, User) {
1818
};
1919

2020
$scope.delete = function(id) {
21-
21+
2222
User.delete({ id: id }, function() {
2323
// Refresh users
2424
// $scope.users = User.query();
@@ -28,4 +28,4 @@ function UserCtrl($scope, User) {
2828
$scope.isForm = false;
2929
};
3030

31-
}
31+
}]);

‎angularjs-mongodb-rest-resources/controllers/default.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
exports.install = function(framework) {
2-
framework.route('/*', view_app);
1+
exports.install = function() {
2+
F.route('/*', view_app);
33
};
44

55
function view_app() {

‎angularjs-mongodb-rest-resources/controllers/user.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
exports.install = function(framework) {
2-
framework.route('/user/', json_user_query);
3-
framework.route('/user/{id}/', json_user_get);
4-
framework.route('/user/{id}/', json_user_save, ['post', 'json']);
5-
framework.route('/user/{id}/', json_user_delete, ['delete']);
1+
exports.install = function() {
2+
F.restful('/users/', [], json_user_query, json_user_get, json_user_save, json_user_delete);
3+
// ... is same as:
4+
// F.route('/user/', json_user_query);
5+
// F.route('/user/{id}/', json_user_get);
6+
// F.route('/user/{id}/', json_user_save, ['post', 'json']);
7+
// F.route('/user/{id}/', json_user_delete, ['delete']);
68
};
79

810
/*

‎angularjs-mongodb-rest-resources/definitions/mongoose.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
var mongoose = require('mongoose');
2-
mongoose.connect(framework.config.database);
2+
mongoose.connect(F.config.database);
33

44
global.mongoose = mongoose;

‎angularjs-mongodb-rest-resources/modules/angular.js

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
// MIT License
2+
// Copyright Peter Širka <petersirka@gmail.com>
23
// Version 1.01
34

45
exports.name = 'angular.js';
5-
exports.version = '1.00';
6-
exports.options = { 'angular-version': '1.2.18', 'angular-i18n-version': '1.2.15' };
6+
exports.version = '1.01';
7+
exports.options = { 'angular-version': '1.3.15', 'angular-i18n-version': '1.3.15' };
78

89
var fs = require('fs');
910
var EXTENSION_JS = '.js';
@@ -13,7 +14,9 @@ var REPOSITORY_ANGULAR_COMMON = '$angular-common';
1314
var REPOSITORY_ANGULAR_CONTROLLER = '$angular-controller';
1415
var REPOSITORY_ANGULAR_OTHER = '$angular-other';
1516

16-
exports.install = function(framework, options) {
17+
exports.install = function() {
18+
19+
var options = framework.version >= 1900 ? arguments[0] : arguments[1];
1720

1821
Utils.extend(exports.options, options, true);
1922

@@ -74,14 +77,14 @@ exports.install = function(framework, options) {
7477

7578
if (length > 1) {
7679
for (var i = 0; i < length; i++)
77-
self.ngCommon.call(self, arguments[i]);
80+
framework.helpers.call(self, arguments[i]);
7881
return '';
7982
}
8083

8184
if (name instanceof Array) {
8285
length = name.length;
8386
for (var i = 0; i < length; i++)
84-
self.ngCommon.call(self, name[i]);
87+
framework.helpers.ngCommon.call(self, name[i]);
8588
return '';
8689
}
8790

@@ -128,7 +131,7 @@ exports.install = function(framework, options) {
128131
if (name.lastIndexOf(EXTENSION_JS) === -1)
129132
extension = EXTENSION_JS;
130133

131-
output += $script_create(isLocal ? '/i18n/angular-locale_' + name + extension : '//cdnjs.cloudflare.com/ajax/libs/angular-i18n/' + exports.options['angular-i18n-version'] + '/angular-locale_' + name + extension);
134+
output += $script_create(isLocal ? '/i18n/angular-locale_' + name + extension : '//cdnjs.cloudflare.com/ajax/libs/angular.js/' + exports.options['angular-i18n-version'] + '/i18n/angular-locale_' + name + extension);
132135
self.repository[REPOSITORY_ANGULAR_LOCALE] = output;
133136

134137
return '';
@@ -404,7 +407,7 @@ exports.install = function(framework, options) {
404407
framework.on('controller-render-head', event_render_head);
405408
};
406409

407-
exports.uninstall = function(framework) {
410+
exports.uninstall = function() {
408411
delete framework.helpers.ng;
409412
delete framework.helpers.ngInclude;
410413
delete framework.helpers.ngResource;
@@ -427,4 +430,4 @@ function event_render_head(controller) {
427430

428431
function $script_create(url) {
429432
return '<script type="text/javascript" src="' + url + '"></script>';
430-
}
433+
}

‎angularjs-mongodb-rest-resources/readme.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
![TOTALSTACK logo](http://www.totaljs.com/img/totalstack.png)
21
# How to run it?
32

43
## First step

‎angularjs-nedb-rest-resources/app/controllers/user.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
function UserCtrl($scope, User) {
1+
app.controller('UserCtrl', ['$scope', 'User', function($scope, User) {
22

33
$scope.users = User.query();
44
$scope.isForm = false;
55

6-
$scope.edit = function (_id) {
6+
$scope.edit = function (_id) {
77
$scope.user = User.get({ _id: _id });
88
$scope.isForm = true;
99
};
@@ -20,7 +20,7 @@ function UserCtrl($scope, User) {
2020
};
2121

2222
$scope.delete = function(_id) {
23-
23+
2424
User.delete({ _id: _id }, function() {
2525
// Refresh users
2626
$scope.users = User.query();
@@ -30,4 +30,4 @@ function UserCtrl($scope, User) {
3030
$scope.isForm = false;
3131
};
3232

33-
}
33+
}]);

‎angularjs-nedb-rest-resources/controllers/default.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
exports.install = function(framework) {
2-
framework.route('/*', view_app);
1+
exports.install = function() {
2+
F.route('/*', view_app);
33
};
44

55
function view_app() {

0 commit comments

Comments
 (0)