Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-03-16 23:30:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(minErr): remove references to internals APIs

Browse source 
So that we can use minErr with angular-loader, before full angular is loaded.

This also fixes replacing the version during the build.
This commit is contained in:
Vojta Jina 2013-11-14 14:18:55 -08:00
parent 04492ef227
commit 94764ee089
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/grunt/utils.js
View file

@ -168,7 +168,7 @@ module.exports = {
var mapFile = minFile + '.map';
var mapFileName = mapFile.match(/[^\/]+$/)[0];
var errorFileName = file.replace(/\.js$/, '-errors.json');
var versionNumber = this.getVersion().number;
var versionNumber = this.getVersion().full;
shell.exec(
'java ' +
this.java32flags() + ' ' +

14
src/minErr.js
View file

@ -35,11 +35,11 @@ function minErr(module) {
template = arguments[1],
templateArgs = arguments,
stringify = function (obj) {
if (isFunction(obj)) {
if (typeof obj === 'function') {
return obj.toString().replace(/ \{[\s\S]*$/, '');
} else if (isUndefined(obj)) {
} else if (typeof obj === 'undefined') {
return 'undefined';
} else if (!isString(obj)) {
} else if (typeof obj !== 'string') {
return JSON.stringify(obj);
}
return obj;
@ -51,11 +51,11 @@ function minErr(module) {
if (index + 2 < templateArgs.length) {
arg = templateArgs[index + 2];
if (isFunction(arg)) {
if (typeof arg === 'function') {
return arg.toString().replace(/ ?\{[\s\S]*$/, '');
} else if (isUndefined(arg)) {
} else if (typeof arg === 'undefined') {
return 'undefined';
} else if (!isString(arg)) {
} else if (typeof arg !== 'string') {
return toJson(arg);
}
return arg;
@ -63,7 +63,7 @@ function minErr(module) {
return match;
});
message = message + '\nhttp://errors.angularjs.org/' + version.full + '/' +
message = message + '\nhttp://errors.angularjs.org/"NG_VERSION_FULL"/' +
(module ? module + '/' : '') + code;
for (i = 2; i < arguments.length; i++) {
message = message + (i == 2 ? '?' : '&') + 'p' + (i-2) + '=' +