Commit 81790aed by Torkel Ödegaard

tech(lib upgrade): updated angularjs to 1.4.3

parent 1f7ac11b
...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
], ],
"dependencies": { "dependencies": {
"jquery": "~2.1.4", "jquery": "~2.1.4",
"angular": "~1.4.0", "angular": "~1.4.3",
"angular-route": "~1.4.0", "angular-route": "~1.4.3",
"angular-mocks": "~1.4.0", "angular-mocks": "~1.4.3",
"angular-sanitize": "~1.4.0", "angular-sanitize": "~1.4.3",
"angular-native-dragdrop": "~1.1.0", "angular-native-dragdrop": "~1.1.0",
"angular-bindonce": "~0.3.3", "angular-bindonce": "~0.3.3",
"requirejs": "~2.1.18", "requirejs": "~2.1.18",
......
{ {
"name": "angular-mocks", "name": "angular-mocks",
"version": "1.4.0", "version": "1.4.3",
"main": "./angular-mocks.js", "main": "./angular-mocks.js",
"ignore": [], "ignore": [],
"dependencies": { "dependencies": {
"angular": "1.4.0" "angular": "1.4.3"
}, },
"homepage": "https://github.com/angular/bower-angular-mocks", "homepage": "https://github.com/angular/bower-angular-mocks",
"_release": "1.4.0", "_release": "1.4.3",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.4.0", "tag": "v1.4.3",
"commit": "5a7f9f0bad5da4314df7f638fcaf330ff864cae2" "commit": "7e3beec84afceeb060a3c6def0d7ca965727851c"
}, },
"_source": "git://github.com/angular/bower-angular-mocks.git", "_source": "git://github.com/angular/bower-angular-mocks.git",
"_target": "~1.4.0", "_target": "~1.4.3",
"_originalSource": "angular-mocks", "_originalSource": "angular-mocks"
"_direct": true
} }
\ No newline at end of file
/** /**
* @license AngularJS v1.4.0 * @license AngularJS v1.4.3
* (c) 2010-2015 Google, Inc. http://angularjs.org * (c) 2010-2015 Google, Inc. http://angularjs.org
* License: MIT * License: MIT
*/ */
...@@ -771,15 +771,14 @@ angular.mock.animate = angular.module('ngAnimateMock', ['ng']) ...@@ -771,15 +771,14 @@ angular.mock.animate = angular.module('ngAnimateMock', ['ng'])
}; };
}); });
$provide.decorator('$animate', ['$delegate', '$$asyncCallback', '$timeout', '$browser', '$$rAF', $provide.decorator('$animate', ['$delegate', '$timeout', '$browser', '$$rAF',
function($delegate, $$asyncCallback, $timeout, $browser, $$rAF) { function($delegate, $timeout, $browser, $$rAF) {
var animate = { var animate = {
queue: [], queue: [],
cancel: $delegate.cancel, cancel: $delegate.cancel,
enabled: $delegate.enabled, enabled: $delegate.enabled,
triggerCallbackEvents: function() { triggerCallbackEvents: function() {
$$rAF.flush(); $$rAF.flush();
$$asyncCallback.flush();
}, },
triggerCallbackPromise: function() { triggerCallbackPromise: function() {
$timeout.flush(0); $timeout.flush(0);
...@@ -1090,7 +1089,7 @@ angular.mock.dump = function(object) { ...@@ -1090,7 +1089,7 @@ angular.mock.dump = function(object) {
$httpBackend.flush(); $httpBackend.flush();
$httpBackend.expectPOST('/add-msg.py', undefined, function(headers) { $httpBackend.expectPOST('/add-msg.py', undefined, function(headers) {
// check if the header was send, if it wasn't the expectation won't // check if the header was sent, if it wasn't the expectation won't
// match the request and the test will fail // match the request and the test will fail
return headers['Authorization'] == 'xxx'; return headers['Authorization'] == 'xxx';
}).respond(201, ''); }).respond(201, '');
...@@ -1771,20 +1770,6 @@ angular.mock.$RAFDecorator = ['$delegate', function($delegate) { ...@@ -1771,20 +1770,6 @@ angular.mock.$RAFDecorator = ['$delegate', function($delegate) {
return rafFn; return rafFn;
}]; }];
angular.mock.$AsyncCallbackDecorator = ['$delegate', function($delegate) {
var callbacks = [];
var addFn = function(fn) {
callbacks.push(fn);
};
addFn.flush = function() {
angular.forEach(callbacks, function(fn) {
fn();
});
callbacks = [];
};
return addFn;
}];
/** /**
* *
*/ */
...@@ -1891,7 +1876,6 @@ angular.module('ngMock', ['ng']).provider({ ...@@ -1891,7 +1876,6 @@ angular.module('ngMock', ['ng']).provider({
}).config(['$provide', function($provide) { }).config(['$provide', function($provide) {
$provide.decorator('$timeout', angular.mock.$TimeoutDecorator); $provide.decorator('$timeout', angular.mock.$TimeoutDecorator);
$provide.decorator('$$rAF', angular.mock.$RAFDecorator); $provide.decorator('$$rAF', angular.mock.$RAFDecorator);
$provide.decorator('$$asyncCallback', angular.mock.$AsyncCallbackDecorator);
$provide.decorator('$rootScope', angular.mock.$RootScopeDecorator); $provide.decorator('$rootScope', angular.mock.$RootScopeDecorator);
$provide.decorator('$controller', angular.mock.$ControllerDecorator); $provide.decorator('$controller', angular.mock.$ControllerDecorator);
}]); }]);
......
{ {
"name": "angular-mocks", "name": "angular-mocks",
"version": "1.4.0", "version": "1.4.3",
"main": "./angular-mocks.js", "main": "./angular-mocks.js",
"ignore": [], "ignore": [],
"dependencies": { "dependencies": {
"angular": "1.4.0" "angular": "1.4.3"
} }
} }
{ {
"name": "angular-mocks", "name": "angular-mocks",
"version": "1.4.0", "version": "1.4.3",
"description": "AngularJS mocks for testing", "description": "AngularJS mocks for testing",
"main": "angular-mocks.js", "main": "angular-mocks.js",
"scripts": { "scripts": {
......
{ {
"name": "angular-native-dragdrop", "name": "angular-native-dragdrop",
"version": "1.1.0", "version": "1.1.1",
"homepage": "http://angular-dragdrop.github.io/angular-dragdrop", "homepage": "http://angular-dragdrop.github.io/angular-dragdrop",
"authors": [ "authors": [
"ganarajpr" "ganarajpr"
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
"html5" "html5"
], ],
"dependencies": { "dependencies": {
"angular": "~1.3" "angular": "^1.3"
}, },
"license": "MIT", "license": "MIT",
"ignore": [ "ignore": [
...@@ -24,14 +24,13 @@ ...@@ -24,14 +24,13 @@
"test", "test",
"tests" "tests"
], ],
"_release": "1.1.0", "_release": "1.1.1",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.1.0", "tag": "v1.1.1",
"commit": "737981e86bd32a5432fa9edf09059ca3c0f22049" "commit": "4ff89cb0aa61070508e935729fb816fd46a58f60"
}, },
"_source": "git://github.com/angular-dragdrop/angular-dragdrop.git", "_source": "git://github.com/angular-dragdrop/angular-dragdrop.git",
"_target": "~1.1.0", "_target": "~1.1.0",
"_originalSource": "angular-native-dragdrop", "_originalSource": "angular-native-dragdrop"
"_direct": true
} }
\ No newline at end of file
#Angular-DragDrop #Angular-DragDrop
[![npm version](http://img.shields.io/npm/v/angular-native-dragdrop.svg?style=flat)](https://npmjs.org/package/angular-native-dragdrop)
[![Build status](http://img.shields.io/travis/angular-dragdrop/angular-dragdrop.svg?style=flat)](https://travis-ci.org/angular-dragdrop/angular-dragdrop) [![Build status](http://img.shields.io/travis/angular-dragdrop/angular-dragdrop.svg?style=flat)](https://travis-ci.org/angular-dragdrop/angular-dragdrop)
[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/ganarajpr/angular-dragdrop?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/ganarajpr/angular-dragdrop?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
......
{ {
"name": "angular-native-dragdrop", "name": "angular-native-dragdrop",
"version": "1.0.8", "version": "1.1.1",
"homepage": "http://angular-dragdrop.github.io/angular-dragdrop", "homepage": "http://angular-dragdrop.github.io/angular-dragdrop",
"authors": [ "authors": [
"ganarajpr" "ganarajpr"
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
"html5" "html5"
], ],
"dependencies": { "dependencies": {
"angular": "~1.3" "angular": "^1.3"
}, },
"license": "MIT", "license": "MIT",
"ignore": [ "ignore": [
......
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
<title>Angular DragDrop (Demo)</title> <title>Angular DragDrop (Demo)</title>
<script>document.write('<base href="' + document.location + '" />');</script> <script>document.write('<base href="' + document.location + '" />');</script>
<link rel="stylesheet" href="css/styles.css" /> <link rel="stylesheet" href="css/styles.css" />
<script data-require="angular.js@1.3.x" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.js" data-semver="1.3.14"></script> <script data-require="angular.js@1.4.x" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.3/angular.js" data-semver="1.4.3"></script>
<script src="http://pc035860.github.io/angular-highlightjs/angular-highlightjs.min.js"></script> <script src="http://pc035860.github.io/angular-highlightjs/angular-highlightjs.min.js"></script>
<script src="js/app.js"></script> <script src="js/app.js"></script>
<script src="../draganddrop.js"></script> <script src="../draganddrop.js"></script>
<link href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css" rel="stylesheet"> <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet">
</head> </head>
<body > <body >
......
...@@ -5,6 +5,18 @@ ...@@ -5,6 +5,18 @@
return 'ondrag' in document.createElement('a'); return 'ondrag' in document.createElement('a');
} }
function determineEffectAllowed(e) {
// Chrome doesn't set dropEffect, so we have to work it out ourselves
if (e.dataTransfer.dropEffect === 'none') {
if (e.dataTransfer.effectAllowed === 'copy' ||
e.dataTransfer.effectAllowed === 'move') {
e.dataTransfer.dropEffect = e.dataTransfer.effectAllowed;
} else if (e.dataTransfer.effectAllowed === 'copyMove' || e.dataTransfer.effectAllowed === 'copymove') {
e.dataTransfer.dropEffect = e.ctrlKey ? 'copy' : 'move';
}
}
}
if (!isDnDsSupported()) { if (!isDnDsSupported()) {
angular.module('ang-drag-drop', []); angular.module('ang-drag-drop', []);
return; return;
...@@ -54,6 +66,9 @@ ...@@ -54,6 +66,9 @@
}, 0); }, 0);
var sendChannel = attrs.dragChannel || 'defaultchannel'; var sendChannel = attrs.dragChannel || 'defaultchannel';
$rootScope.$broadcast('ANGULAR_DRAG_END', e, sendChannel); $rootScope.$broadcast('ANGULAR_DRAG_END', e, sendChannel);
determineEffectAllowed(e);
if (e.dataTransfer && e.dataTransfer.dropEffect !== 'none') { if (e.dataTransfer && e.dataTransfer.dropEffect !== 'none') {
if (attrs.onDropSuccess) { if (attrs.onDropSuccess) {
var onDropSuccessFn = $parse(attrs.onDropSuccess); var onDropSuccessFn = $parse(attrs.onDropSuccess);
...@@ -87,7 +102,11 @@ ...@@ -87,7 +102,11 @@
element.addClass(draggingClass); element.addClass(draggingClass);
element.bind('$destroy', dragendHandler); element.bind('$destroy', dragendHandler);
if (dragImage) { //Code to make sure that the setDragImage is available. IE 10, 11, and Opera do not support setDragImage.
var hasNativeDraggable = !(document.uniqueID || window.opera);
//If there is a draggable image passed in, then set the image to be dragged.
if (dragImage && hasNativeDraggable) {
var dragImageFn = $parse(attrs.dragImage); var dragImageFn = $parse(attrs.dragImage);
scope.$apply(function() { scope.$apply(function() {
var dragImageParameters = dragImageFn(scope, {$event: e}); var dragImageParameters = dragImageFn(scope, {$event: e});
...@@ -208,15 +227,7 @@ ...@@ -208,15 +227,7 @@
var sendData = e.dataTransfer.getData('text'); var sendData = e.dataTransfer.getData('text');
sendData = angular.fromJson(sendData); sendData = angular.fromJson(sendData);
// Chrome doesn't set dropEffect, so we have to work it out ourselves determineEffectAllowed(e);
if (e.dataTransfer.dropEffect === 'none') {
if (e.dataTransfer.effectAllowed === 'copy' ||
e.dataTransfer.effectAllowed === 'move') {
e.dataTransfer.dropEffect = e.dataTransfer.effectAllowed;
} else if (e.dataTransfer.effectAllowed === 'copyMove') {
e.dataTransfer.dropEffect = e.ctrlKey ? 'copy' : 'move';
}
}
var uiOnDropFn = $parse(attr.uiOnDrop); var uiOnDropFn = $parse(attr.uiOnDrop);
scope.$evalAsync(function() { scope.$evalAsync(function() {
...@@ -258,7 +269,12 @@ ...@@ -258,7 +269,12 @@
if (valid && attr.dropValidate) { if (valid && attr.dropValidate) {
var validateFn = $parse(attr.dropValidate); var validateFn = $parse(attr.dropValidate);
valid = validateFn(scope, {$drop: {scope: scope, element:element}, $event:e, $data: transferDataObject.data, $channel: transferDataObject.channel}); valid = validateFn(scope, {
$drop: {scope: scope, element: element},
$event: e,
$data: transferDataObject.data,
$channel: transferDataObject.channel
});
} }
if (valid) { if (valid) {
......
{ {
"name": "angular-native-dragdrop", "name": "angular-native-dragdrop",
"version": "1.0.8", "version": "1.1.1",
"description": "Angular HTML5 Drag and Drop directive written in pure with no dependency on JQuery.", "description": "Angular HTML5 Drag and Drop directive written in pure with no dependency on JQuery.",
"main": "draganddrop.js", "main": "draganddrop.js",
"scripts": { "scripts": {
......
{ {
"name": "angular-route", "name": "angular-route",
"version": "1.4.0", "version": "1.4.3",
"main": "./angular-route.js", "main": "./angular-route.js",
"ignore": [], "ignore": [],
"dependencies": { "dependencies": {
"angular": "1.4.0" "angular": "1.4.3"
}, },
"homepage": "https://github.com/angular/bower-angular-route", "homepage": "https://github.com/angular/bower-angular-route",
"_release": "1.4.0", "_release": "1.4.3",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.4.0", "tag": "v1.4.3",
"commit": "af773f99661df8a9ca9275d123a1daf6cc0bf778" "commit": "6d34da91a291260d1826c42f163ac21d094cc0fc"
}, },
"_source": "git://github.com/angular/bower-angular-route.git", "_source": "git://github.com/angular/bower-angular-route.git",
"_target": "~1.4.0", "_target": "~1.4.3",
"_originalSource": "angular-route", "_originalSource": "angular-route"
"_direct": true
} }
\ No newline at end of file
/** /**
* @license AngularJS v1.4.0 * @license AngularJS v1.4.3
* (c) 2010-2015 Google, Inc. http://angularjs.org * (c) 2010-2015 Google, Inc. http://angularjs.org
* License: MIT * License: MIT
*/ */
...@@ -412,7 +412,9 @@ function $RouteProvider() { ...@@ -412,7 +412,9 @@ function $RouteProvider() {
* @name $route#$routeChangeSuccess * @name $route#$routeChangeSuccess
* @eventType broadcast on root scope * @eventType broadcast on root scope
* @description * @description
* Broadcasted after a route dependencies are resolved. * Broadcasted after a route change has happened successfully.
* The `resolve` dependencies are now available in the `current.locals` property.
*
* {@link ngRoute.directive:ngView ngView} listens for the directive * {@link ngRoute.directive:ngView ngView} listens for the directive
* to instantiate the controller and render the view. * to instantiate the controller and render the view.
* *
...@@ -596,9 +598,8 @@ function $RouteProvider() { ...@@ -596,9 +598,8 @@ function $RouteProvider() {
if (angular.isFunction(templateUrl)) { if (angular.isFunction(templateUrl)) {
templateUrl = templateUrl(nextRoute.params); templateUrl = templateUrl(nextRoute.params);
} }
templateUrl = $sce.getTrustedResourceUrl(templateUrl);
if (angular.isDefined(templateUrl)) { if (angular.isDefined(templateUrl)) {
nextRoute.loadedTemplateUrl = templateUrl; nextRoute.loadedTemplateUrl = $sce.valueOf(templateUrl);
template = $templateRequest(templateUrl); template = $templateRequest(templateUrl);
} }
} }
......
/* /*
AngularJS v1.4.0 AngularJS v1.4.3
(c) 2010-2015 Google, Inc. http://angularjs.org (c) 2010-2015 Google, Inc. http://angularjs.org
License: MIT License: MIT
*/ */
(function(q,d,C){'use strict';function v(r,k,h){return{restrict:"ECA",terminal:!0,priority:400,transclude:"element",link:function(a,f,b,c,y){function z(){l&&(h.cancel(l),l=null);m&&(m.$destroy(),m=null);n&&(l=h.leave(n),l.then(function(){l=null}),n=null)}function x(){var b=r.current&&r.current.locals;if(d.isDefined(b&&b.$template)){var b=a.$new(),c=r.current;n=y(b,function(b){h.enter(b,null,n||f).then(function(){!d.isDefined(t)||t&&!a.$eval(t)||k()});z()});m=c.scope=b;m.$emit("$viewContentLoaded"); (function(p,c,C){'use strict';function v(r,h,g){return{restrict:"ECA",terminal:!0,priority:400,transclude:"element",link:function(a,f,b,d,y){function z(){k&&(g.cancel(k),k=null);l&&(l.$destroy(),l=null);m&&(k=g.leave(m),k.then(function(){k=null}),m=null)}function x(){var b=r.current&&r.current.locals;if(c.isDefined(b&&b.$template)){var b=a.$new(),d=r.current;m=y(b,function(b){g.enter(b,null,m||f).then(function(){!c.isDefined(t)||t&&!a.$eval(t)||h()});z()});l=d.scope=b;l.$emit("$viewContentLoaded");
m.$eval(w)}else z()}var m,n,l,t=b.autoscroll,w=b.onload||"";a.$on("$routeChangeSuccess",x);x()}}}function A(d,k,h){return{restrict:"ECA",priority:-400,link:function(a,f){var b=h.current,c=b.locals;f.html(c.$template);var y=d(f.contents());b.controller&&(c.$scope=a,c=k(b.controller,c),b.controllerAs&&(a[b.controllerAs]=c),f.data("$ngControllerController",c),f.children().data("$ngControllerController",c));y(a)}}}q=d.module("ngRoute",["ng"]).provider("$route",function(){function r(a,f){return d.extend(Object.create(a), l.$eval(w)}else z()}var l,m,k,t=b.autoscroll,w=b.onload||"";a.$on("$routeChangeSuccess",x);x()}}}function A(c,h,g){return{restrict:"ECA",priority:-400,link:function(a,f){var b=g.current,d=b.locals;f.html(d.$template);var y=c(f.contents());b.controller&&(d.$scope=a,d=h(b.controller,d),b.controllerAs&&(a[b.controllerAs]=d),f.data("$ngControllerController",d),f.children().data("$ngControllerController",d));y(a)}}}p=c.module("ngRoute",["ng"]).provider("$route",function(){function r(a,f){return c.extend(Object.create(a),
f)}function k(a,d){var b=d.caseInsensitiveMatch,c={originalPath:a,regexp:a},h=c.keys=[];a=a.replace(/([().])/g,"\\$1").replace(/(\/)?:(\w+)([\?\*])?/g,function(a,d,b,c){a="?"===c?c:null;c="*"===c?c:null;h.push({name:b,optional:!!a});d=d||"";return""+(a?"":d)+"(?:"+(a?d:"")+(c&&"(.+?)"||"([^/]+)")+(a||"")+")"+(a||"")}).replace(/([\/$\*])/g,"\\$1");c.regexp=new RegExp("^"+a+"$",b?"i":"");return c}var h={};this.when=function(a,f){var b=d.copy(f);d.isUndefined(b.reloadOnSearch)&&(b.reloadOnSearch=!0); f)}function h(a,c){var b=c.caseInsensitiveMatch,d={originalPath:a,regexp:a},g=d.keys=[];a=a.replace(/([().])/g,"\\$1").replace(/(\/)?:(\w+)([\?\*])?/g,function(a,c,b,d){a="?"===d?d:null;d="*"===d?d:null;g.push({name:b,optional:!!a});c=c||"";return""+(a?"":c)+"(?:"+(a?c:"")+(d&&"(.+?)"||"([^/]+)")+(a||"")+")"+(a||"")}).replace(/([\/$\*])/g,"\\$1");d.regexp=new RegExp("^"+a+"$",b?"i":"");return d}var g={};this.when=function(a,f){var b=c.copy(f);c.isUndefined(b.reloadOnSearch)&&(b.reloadOnSearch=!0);
d.isUndefined(b.caseInsensitiveMatch)&&(b.caseInsensitiveMatch=this.caseInsensitiveMatch);h[a]=d.extend(b,a&&k(a,b));if(a){var c="/"==a[a.length-1]?a.substr(0,a.length-1):a+"/";h[c]=d.extend({redirectTo:a},k(c,b))}return this};this.caseInsensitiveMatch=!1;this.otherwise=function(a){"string"===typeof a&&(a={redirectTo:a});this.when(null,a);return this};this.$get=["$rootScope","$location","$routeParams","$q","$injector","$templateRequest","$sce",function(a,f,b,c,k,q,x){function m(b){var e=s.current; c.isUndefined(b.caseInsensitiveMatch)&&(b.caseInsensitiveMatch=this.caseInsensitiveMatch);g[a]=c.extend(b,a&&h(a,b));if(a){var d="/"==a[a.length-1]?a.substr(0,a.length-1):a+"/";g[d]=c.extend({redirectTo:a},h(d,b))}return this};this.caseInsensitiveMatch=!1;this.otherwise=function(a){"string"===typeof a&&(a={redirectTo:a});this.when(null,a);return this};this.$get=["$rootScope","$location","$routeParams","$q","$injector","$templateRequest","$sce",function(a,f,b,d,h,p,x){function l(b){var e=s.current;
(v=(p=l())&&e&&p.$$route===e.$$route&&d.equals(p.pathParams,e.pathParams)&&!p.reloadOnSearch&&!w)||!e&&!p||a.$broadcast("$routeChangeStart",p,e).defaultPrevented&&b&&b.preventDefault()}function n(){var u=s.current,e=p;if(v)u.params=e.params,d.copy(u.params,b),a.$broadcast("$routeUpdate",u);else if(e||u)w=!1,(s.current=e)&&e.redirectTo&&(d.isString(e.redirectTo)?f.path(t(e.redirectTo,e.params)).search(e.params).replace():f.url(e.redirectTo(e.pathParams,f.path(),f.search())).replace()),c.when(e).then(function(){if(e){var a= (v=(n=k())&&e&&n.$$route===e.$$route&&c.equals(n.pathParams,e.pathParams)&&!n.reloadOnSearch&&!w)||!e&&!n||a.$broadcast("$routeChangeStart",n,e).defaultPrevented&&b&&b.preventDefault()}function m(){var u=s.current,e=n;if(v)u.params=e.params,c.copy(u.params,b),a.$broadcast("$routeUpdate",u);else if(e||u)w=!1,(s.current=e)&&e.redirectTo&&(c.isString(e.redirectTo)?f.path(t(e.redirectTo,e.params)).search(e.params).replace():f.url(e.redirectTo(e.pathParams,f.path(),f.search())).replace()),d.when(e).then(function(){if(e){var a=
d.extend({},e.resolve),b,g;d.forEach(a,function(b,e){a[e]=d.isString(b)?k.get(b):k.invoke(b,null,null,e)});d.isDefined(b=e.template)?d.isFunction(b)&&(b=b(e.params)):d.isDefined(g=e.templateUrl)&&(d.isFunction(g)&&(g=g(e.params)),g=x.getTrustedResourceUrl(g),d.isDefined(g)&&(e.loadedTemplateUrl=g,b=q(g)));d.isDefined(b)&&(a.$template=b);return c.all(a)}}).then(function(c){e==s.current&&(e&&(e.locals=c,d.copy(e.params,b)),a.$broadcast("$routeChangeSuccess",e,u))},function(b){e==s.current&&a.$broadcast("$routeChangeError", c.extend({},e.resolve),b,f;c.forEach(a,function(b,e){a[e]=c.isString(b)?h.get(b):h.invoke(b,null,null,e)});c.isDefined(b=e.template)?c.isFunction(b)&&(b=b(e.params)):c.isDefined(f=e.templateUrl)&&(c.isFunction(f)&&(f=f(e.params)),c.isDefined(f)&&(e.loadedTemplateUrl=x.valueOf(f),b=p(f)));c.isDefined(b)&&(a.$template=b);return d.all(a)}}).then(function(f){e==s.current&&(e&&(e.locals=f,c.copy(e.params,b)),a.$broadcast("$routeChangeSuccess",e,u))},function(b){e==s.current&&a.$broadcast("$routeChangeError",
e,u,b)})}function l(){var a,b;d.forEach(h,function(c,h){var g;if(g=!b){var k=f.path();g=c.keys;var m={};if(c.regexp)if(k=c.regexp.exec(k)){for(var l=1,n=k.length;l<n;++l){var p=g[l-1],q=k[l];p&&q&&(m[p.name]=q)}g=m}else g=null;else g=null;g=a=g}g&&(b=r(c,{params:d.extend({},f.search(),a),pathParams:a}),b.$$route=c)});return b||h[null]&&r(h[null],{params:{},pathParams:{}})}function t(a,b){var c=[];d.forEach((a||"").split(":"),function(a,d){if(0===d)c.push(a);else{var f=a.match(/(\w+)(?:[?*])?(.*)/), e,u,b)})}function k(){var a,b;c.forEach(g,function(d,g){var q;if(q=!b){var h=f.path();q=d.keys;var l={};if(d.regexp)if(h=d.regexp.exec(h)){for(var k=1,m=h.length;k<m;++k){var n=q[k-1],p=h[k];n&&p&&(l[n.name]=p)}q=l}else q=null;else q=null;q=a=q}q&&(b=r(d,{params:c.extend({},f.search(),a),pathParams:a}),b.$$route=d)});return b||g[null]&&r(g[null],{params:{},pathParams:{}})}function t(a,b){var d=[];c.forEach((a||"").split(":"),function(a,c){if(0===c)d.push(a);else{var f=a.match(/(\w+)(?:[?*])?(.*)/),
h=f[1];c.push(b[h]);c.push(f[2]||"");delete b[h]}});return c.join("")}var w=!1,p,v,s={routes:h,reload:function(){w=!0;a.$evalAsync(function(){m();n()})},updateParams:function(a){if(this.current&&this.current.$$route)a=d.extend({},this.current.params,a),f.path(t(this.current.$$route.originalPath,a)),f.search(a);else throw B("norout");}};a.$on("$locationChangeStart",m);a.$on("$locationChangeSuccess",n);return s}]});var B=d.$$minErr("ngRoute");q.provider("$routeParams",function(){this.$get=function(){return{}}}); g=f[1];d.push(b[g]);d.push(f[2]||"");delete b[g]}});return d.join("")}var w=!1,n,v,s={routes:g,reload:function(){w=!0;a.$evalAsync(function(){l();m()})},updateParams:function(a){if(this.current&&this.current.$$route)a=c.extend({},this.current.params,a),f.path(t(this.current.$$route.originalPath,a)),f.search(a);else throw B("norout");}};a.$on("$locationChangeStart",l);a.$on("$locationChangeSuccess",m);return s}]});var B=c.$$minErr("ngRoute");p.provider("$routeParams",function(){this.$get=function(){return{}}});
q.directive("ngView",v);q.directive("ngView",A);v.$inject=["$route","$anchorScroll","$animate"];A.$inject=["$compile","$controller","$route"]})(window,window.angular); p.directive("ngView",v);p.directive("ngView",A);v.$inject=["$route","$anchorScroll","$animate"];A.$inject=["$compile","$controller","$route"]})(window,window.angular);
//# sourceMappingURL=angular-route.min.js.map //# sourceMappingURL=angular-route.min.js.map
{ {
"name": "angular-route", "name": "angular-route",
"version": "1.4.0", "version": "1.4.3",
"main": "./angular-route.js", "main": "./angular-route.js",
"ignore": [], "ignore": [],
"dependencies": { "dependencies": {
"angular": "1.4.0" "angular": "1.4.3"
} }
} }
{ {
"name": "angular-route", "name": "angular-route",
"version": "1.4.0", "version": "1.4.3",
"description": "AngularJS router module", "description": "AngularJS router module",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
......
{ {
"name": "angular-sanitize", "name": "angular-sanitize",
"version": "1.4.0", "version": "1.4.3",
"main": "./angular-sanitize.js", "main": "./angular-sanitize.js",
"ignore": [], "ignore": [],
"dependencies": { "dependencies": {
"angular": "1.4.0" "angular": "1.4.3"
}, },
"homepage": "https://github.com/angular/bower-angular-sanitize", "homepage": "https://github.com/angular/bower-angular-sanitize",
"_release": "1.4.0", "_release": "1.4.3",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.4.0", "tag": "v1.4.3",
"commit": "a64d96eff0b9f15db70322e77bc20c2e64bd8e07" "commit": "0367ee4c3f9cb8af5d1da9ec35b71a8b523d9fc0"
}, },
"_source": "git://github.com/angular/bower-angular-sanitize.git", "_source": "git://github.com/angular/bower-angular-sanitize.git",
"_target": "~1.4.0", "_target": "~1.4.3",
"_originalSource": "angular-sanitize", "_originalSource": "angular-sanitize"
"_direct": true
} }
\ No newline at end of file
/** /**
* @license AngularJS v1.4.0 * @license AngularJS v1.4.3
* (c) 2010-2015 Google, Inc. http://angularjs.org * (c) 2010-2015 Google, Inc. http://angularjs.org
* License: MIT * License: MIT
*/ */
...@@ -233,7 +233,7 @@ var uriAttrs = makeMap("background,cite,href,longdesc,src,usemap,xlink:href"); ...@@ -233,7 +233,7 @@ var uriAttrs = makeMap("background,cite,href,longdesc,src,usemap,xlink:href");
var htmlAttrs = makeMap('abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,' + var htmlAttrs = makeMap('abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,' +
'color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,' + 'color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,' +
'ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,' + 'ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,' +
'scope,scrolling,shape,size,span,start,summary,target,title,type,' + 'scope,scrolling,shape,size,span,start,summary,tabindex,target,title,type,' +
'valign,value,vspace,width'); 'valign,value,vspace,width');
// SVG attributes (without "id" and "name" attributes) // SVG attributes (without "id" and "name" attributes)
...@@ -631,8 +631,8 @@ angular.module('ngSanitize', []).provider('$sanitize', $SanitizeProvider); ...@@ -631,8 +631,8 @@ angular.module('ngSanitize', []).provider('$sanitize', $SanitizeProvider);
*/ */
angular.module('ngSanitize').filter('linky', ['$sanitize', function($sanitize) { angular.module('ngSanitize').filter('linky', ['$sanitize', function($sanitize) {
var LINKY_URL_REGEXP = var LINKY_URL_REGEXP =
/((ftp|https?):\/\/|(www\.)|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>"”’]/, /((ftp|https?):\/\/|(www\.)|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>"”’]/i,
MAILTO_REGEXP = /^mailto:/; MAILTO_REGEXP = /^mailto:/i;
return function(text, target) { return function(text, target) {
if (!text) return text; if (!text) return text;
......
/* /*
AngularJS v1.4.0 AngularJS v1.4.3
(c) 2010-2015 Google, Inc. http://angularjs.org (c) 2010-2015 Google, Inc. http://angularjs.org
License: MIT License: MIT
*/ */
...@@ -9,8 +9,8 @@ b)===b&&(f.comment&&f.comment(a.substring(4,b)),a=a.substring(b+3),k=!1);else if ...@@ -9,8 +9,8 @@ b)===b&&(f.comment&&f.comment(a.substring(4,b)),a=a.substring(b+3),k=!1);else if
a.replace(/</g,"&lt;");return A.textContent}function B(a){return a.replace(/&/g,"&amp;").replace(M,function(a){var d=a.charCodeAt(0);a=a.charCodeAt(1);return"&#"+(1024*(d-55296)+(a-56320)+65536)+";"}).replace(N,function(a){return"&#"+a.charCodeAt(0)+";"}).replace(/</g,"&lt;").replace(/>/g,"&gt;")}function r(a,f){var d=!1,c=h.bind(a,a.push);return{start:function(a,k,e){a=h.lowercase(a);!d&&w[a]&&(d=a);d||!0!==C[a]||(c("<"),c(a),h.forEach(k,function(d,e){var k=h.lowercase(e),g="img"===a&&"src"===k|| a.replace(/</g,"&lt;");return A.textContent}function B(a){return a.replace(/&/g,"&amp;").replace(M,function(a){var d=a.charCodeAt(0);a=a.charCodeAt(1);return"&#"+(1024*(d-55296)+(a-56320)+65536)+";"}).replace(N,function(a){return"&#"+a.charCodeAt(0)+";"}).replace(/</g,"&lt;").replace(/>/g,"&gt;")}function r(a,f){var d=!1,c=h.bind(a,a.push);return{start:function(a,k,e){a=h.lowercase(a);!d&&w[a]&&(d=a);d||!0!==C[a]||(c("<"),c(a),h.forEach(k,function(d,e){var k=h.lowercase(e),g="img"===a&&"src"===k||
"background"===k;!0!==O[k]||!0===D[k]&&!f(d,g)||(c(" "),c(e),c('="'),c(B(d)),c('"'))}),c(e?"/>":">"))},end:function(a){a=h.lowercase(a);d||!0!==C[a]||(c("</"),c(a),c(">"));a==d&&(d=!1)},chars:function(a){d||c(B(a))}}}var L=h.$$minErr("$sanitize"),z=/^<((?:[a-zA-Z])[\w:-]*)((?:\s+[\w:-]+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)\s*(>?)/,y=/^<\/\s*([\w:-]+)[^>]*>/,G=/([\w:-]+)(?:\s*=\s*(?:(?:"((?:[^"])*)")|(?:'((?:[^'])*)')|([^>\s]+)))?/g,K=/^</,J=/^<\//,H=/\x3c!--(.*?)--\x3e/g,x=/<!DOCTYPE([^>]*?)>/i, "background"===k;!0!==O[k]||!0===D[k]&&!f(d,g)||(c(" "),c(e),c('="'),c(B(d)),c('"'))}),c(e?"/>":">"))},end:function(a){a=h.lowercase(a);d||!0!==C[a]||(c("</"),c(a),c(">"));a==d&&(d=!1)},chars:function(a){d||c(B(a))}}}var L=h.$$minErr("$sanitize"),z=/^<((?:[a-zA-Z])[\w:-]*)((?:\s+[\w:-]+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)\s*(>?)/,y=/^<\/\s*([\w:-]+)[^>]*>/,G=/([\w:-]+)(?:\s*=\s*(?:(?:"((?:[^"])*)")|(?:'((?:[^'])*)')|([^>\s]+)))?/g,K=/^</,J=/^<\//,H=/\x3c!--(.*?)--\x3e/g,x=/<!DOCTYPE([^>]*?)>/i,
I=/<!\[CDATA\[(.*?)]]\x3e/g,M=/[\uD800-\uDBFF][\uDC00-\uDFFF]/g,N=/([^\#-~| |!])/g,v=g("area,br,col,hr,img,wbr");n=g("colgroup,dd,dt,li,p,tbody,td,tfoot,th,thead,tr");p=g("rp,rt");var u=h.extend({},p,n),s=h.extend({},n,g("address,article,aside,blockquote,caption,center,del,dir,div,dl,figure,figcaption,footer,h1,h2,h3,h4,h5,h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,script,section,table,ul")),t=h.extend({},p,g("a,abbr,acronym,b,bdi,bdo,big,br,cite,code,del,dfn,em,font,i,img,ins,kbd,label,map,mark,q,ruby,rp,rt,s,samp,small,span,strike,strong,sub,sup,time,tt,u,var")); I=/<!\[CDATA\[(.*?)]]\x3e/g,M=/[\uD800-\uDBFF][\uDC00-\uDFFF]/g,N=/([^\#-~| |!])/g,v=g("area,br,col,hr,img,wbr");n=g("colgroup,dd,dt,li,p,tbody,td,tfoot,th,thead,tr");p=g("rp,rt");var u=h.extend({},p,n),s=h.extend({},n,g("address,article,aside,blockquote,caption,center,del,dir,div,dl,figure,figcaption,footer,h1,h2,h3,h4,h5,h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,script,section,table,ul")),t=h.extend({},p,g("a,abbr,acronym,b,bdi,bdo,big,br,cite,code,del,dfn,em,font,i,img,ins,kbd,label,map,mark,q,ruby,rp,rt,s,samp,small,span,strike,strong,sub,sup,time,tt,u,var"));
n=g("circle,defs,desc,ellipse,font-face,font-face-name,font-face-src,g,glyph,hkern,image,linearGradient,line,marker,metadata,missing-glyph,mpath,path,polygon,polyline,radialGradient,rect,stop,svg,switch,text,title,tspan,use");var w=g("script,style"),C=h.extend({},v,s,t,u,n),D=g("background,cite,href,longdesc,src,usemap,xlink:href");n=g("abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,scope,scrolling,shape,size,span,start,summary,target,title,type,valign,value,vspace,width"); n=g("circle,defs,desc,ellipse,font-face,font-face-name,font-face-src,g,glyph,hkern,image,linearGradient,line,marker,metadata,missing-glyph,mpath,path,polygon,polyline,radialGradient,rect,stop,svg,switch,text,title,tspan,use");var w=g("script,style"),C=h.extend({},v,s,t,u,n),D=g("background,cite,href,longdesc,src,usemap,xlink:href");n=g("abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,scope,scrolling,shape,size,span,start,summary,tabindex,target,title,type,valign,value,vspace,width");
p=g("accent-height,accumulate,additive,alphabetic,arabic-form,ascent,baseProfile,bbox,begin,by,calcMode,cap-height,class,color,color-rendering,content,cx,cy,d,dx,dy,descent,display,dur,end,fill,fill-rule,font-family,font-size,font-stretch,font-style,font-variant,font-weight,from,fx,fy,g1,g2,glyph-name,gradientUnits,hanging,height,horiz-adv-x,horiz-origin-x,ideographic,k,keyPoints,keySplines,keyTimes,lang,marker-end,marker-mid,marker-start,markerHeight,markerUnits,markerWidth,mathematical,max,min,offset,opacity,orient,origin,overline-position,overline-thickness,panose-1,path,pathLength,points,preserveAspectRatio,r,refX,refY,repeatCount,repeatDur,requiredExtensions,requiredFeatures,restart,rotate,rx,ry,slope,stemh,stemv,stop-color,stop-opacity,strikethrough-position,strikethrough-thickness,stroke,stroke-dasharray,stroke-dashoffset,stroke-linecap,stroke-linejoin,stroke-miterlimit,stroke-opacity,stroke-width,systemLanguage,target,text-anchor,to,transform,type,u1,u2,underline-position,underline-thickness,unicode,unicode-range,units-per-em,values,version,viewBox,visibility,width,widths,x,x-height,x1,x2,xlink:actuate,xlink:arcrole,xlink:role,xlink:show,xlink:title,xlink:type,xml:base,xml:lang,xml:space,xmlns,xmlns:xlink,y,y1,y2,zoomAndPan", p=g("accent-height,accumulate,additive,alphabetic,arabic-form,ascent,baseProfile,bbox,begin,by,calcMode,cap-height,class,color,color-rendering,content,cx,cy,d,dx,dy,descent,display,dur,end,fill,fill-rule,font-family,font-size,font-stretch,font-style,font-variant,font-weight,from,fx,fy,g1,g2,glyph-name,gradientUnits,hanging,height,horiz-adv-x,horiz-origin-x,ideographic,k,keyPoints,keySplines,keyTimes,lang,marker-end,marker-mid,marker-start,markerHeight,markerUnits,markerWidth,mathematical,max,min,offset,opacity,orient,origin,overline-position,overline-thickness,panose-1,path,pathLength,points,preserveAspectRatio,r,refX,refY,repeatCount,repeatDur,requiredExtensions,requiredFeatures,restart,rotate,rx,ry,slope,stemh,stemv,stop-color,stop-opacity,strikethrough-position,strikethrough-thickness,stroke,stroke-dasharray,stroke-dashoffset,stroke-linecap,stroke-linejoin,stroke-miterlimit,stroke-opacity,stroke-width,systemLanguage,target,text-anchor,to,transform,type,u1,u2,underline-position,underline-thickness,unicode,unicode-range,units-per-em,values,version,viewBox,visibility,width,widths,x,x-height,x1,x2,xlink:actuate,xlink:arcrole,xlink:role,xlink:show,xlink:title,xlink:type,xml:base,xml:lang,xml:space,xmlns,xmlns:xlink,y,y1,y2,zoomAndPan",
!0);var O=h.extend({},D,p,n),A=document.createElement("pre");h.module("ngSanitize",[]).provider("$sanitize",function(){this.$get=["$$sanitizeUri",function(a){return function(f){var d=[];F(f,r(d,function(c,b){return!/^unsafe/.test(a(c,b))}));return d.join("")}}]});h.module("ngSanitize").filter("linky",["$sanitize",function(a){var f=/((ftp|https?):\/\/|(www\.)|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>"\u201d\u2019]/,d=/^mailto:/;return function(c,b){function k(a){a&&g.push(E(a))}function e(a,c){g.push("<a "); !0);var O=h.extend({},D,p,n),A=document.createElement("pre");h.module("ngSanitize",[]).provider("$sanitize",function(){this.$get=["$$sanitizeUri",function(a){return function(f){var d=[];F(f,r(d,function(c,b){return!/^unsafe/.test(a(c,b))}));return d.join("")}}]});h.module("ngSanitize").filter("linky",["$sanitize",function(a){var f=/((ftp|https?):\/\/|(www\.)|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>"\u201d\u2019]/i,d=/^mailto:/i;return function(c,b){function k(a){a&&g.push(E(a))}function e(a,
h.isDefined(b)&&g.push('target="',b,'" ');g.push('href="',a.replace(/"/g,"&quot;"),'">');k(c);g.push("</a>")}if(!c)return c;for(var m,l=c,g=[],n,p;m=l.match(f);)n=m[0],m[2]||m[4]||(n=(m[3]?"http://":"mailto:")+n),p=m.index,k(l.substr(0,p)),e(n,m[0].replace(d,"")),l=l.substring(p+m[0].length);k(l);return a(g.join(""))}}])})(window,window.angular); c){g.push("<a ");h.isDefined(b)&&g.push('target="',b,'" ');g.push('href="',a.replace(/"/g,"&quot;"),'">');k(c);g.push("</a>")}if(!c)return c;for(var m,l=c,g=[],n,p;m=l.match(f);)n=m[0],m[2]||m[4]||(n=(m[3]?"http://":"mailto:")+n),p=m.index,k(l.substr(0,p)),e(n,m[0].replace(d,"")),l=l.substring(p+m[0].length);k(l);return a(g.join(""))}}])})(window,window.angular);
//# sourceMappingURL=angular-sanitize.min.js.map //# sourceMappingURL=angular-sanitize.min.js.map
{ {
"name": "angular-sanitize", "name": "angular-sanitize",
"version": "1.4.0", "version": "1.4.3",
"main": "./angular-sanitize.js", "main": "./angular-sanitize.js",
"ignore": [], "ignore": [],
"dependencies": { "dependencies": {
"angular": "1.4.0" "angular": "1.4.3"
} }
} }
{ {
"name": "angular-sanitize", "name": "angular-sanitize",
"version": "1.4.0", "version": "1.4.3",
"description": "AngularJS module for sanitizing HTML", "description": "AngularJS module for sanitizing HTML",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
......
{ {
"name": "angular", "name": "angular",
"version": "1.4.0", "version": "1.4.3",
"main": "./angular.js", "main": "./angular.js",
"ignore": [], "ignore": [],
"dependencies": {}, "dependencies": {},
"homepage": "https://github.com/angular/bower-angular", "homepage": "https://github.com/angular/bower-angular",
"_release": "1.4.0", "_release": "1.4.3",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.4.0", "tag": "v1.4.3",
"commit": "e2f2cf7dc4a3ef1859ab28e657eca0e9edb588ba" "commit": "dbd689e8103a6366e53e1f6786727f7c65ccfd75"
}, },
"_source": "git://github.com/angular/bower-angular.git", "_source": "git://github.com/angular/bower-angular.git",
"_target": "~1.4.0", "_target": "~1.4.3",
"_originalSource": "angular", "_originalSource": "angular"
"_direct": true
} }
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
{ {
"name": "angular", "name": "angular",
"version": "1.4.0", "version": "1.4.3",
"main": "./angular.js", "main": "./angular.js",
"ignore": [], "ignore": [],
"dependencies": { "dependencies": {
......
{ {
"name": "angular", "name": "angular",
"version": "1.4.0", "version": "1.4.3",
"description": "HTML enhanced for web apps", "description": "HTML enhanced for web apps",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
......
{ {
"name": "requirejs", "name": "requirejs",
"version": "2.1.18", "version": "2.1.20",
"ignore": [],
"homepage": "http://requirejs.org", "homepage": "http://requirejs.org",
"authors": [ "authors": [
"jrburke.com" "jrburke.com"
...@@ -14,14 +15,13 @@ ...@@ -14,14 +15,13 @@
"BSD-3-Clause", "BSD-3-Clause",
"MIT" "MIT"
], ],
"_release": "2.1.18", "_release": "2.1.20",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "2.1.18", "tag": "2.1.20",
"commit": "833b2db37b0899f7f2c8b6ada741f49c3a7bfbe9" "commit": "ad0230c737a1289c3ffe3d76ce0f86366955239a"
}, },
"_source": "git://github.com/jrburke/requirejs-bower.git", "_source": "git://github.com/jrburke/requirejs-bower.git",
"_target": "~2.1.18", "_target": "~2.1.18",
"_originalSource": "requirejs", "_originalSource": "requirejs"
"_direct": true
} }
\ No newline at end of file
{ {
"name": "requirejs", "name": "requirejs",
"version": "2.1.18", "version": "2.1.20",
"ignore": [],
"homepage": "http://requirejs.org", "homepage": "http://requirejs.org",
"authors": [ "authors": [
"jrburke.com" "jrburke.com"
......
/** vim: et:ts=4:sw=4:sts=4 /** vim: et:ts=4:sw=4:sts=4
* @license RequireJS 2.1.18 Copyright (c) 2010-2015, The Dojo Foundation All Rights Reserved. * @license RequireJS 2.1.20 Copyright (c) 2010-2015, The Dojo Foundation All Rights Reserved.
* Available via the MIT or new BSD license. * Available via the MIT or new BSD license.
* see: http://github.com/jrburke/requirejs for details * see: http://github.com/jrburke/requirejs for details
*/ */
...@@ -12,7 +12,7 @@ var requirejs, require, define; ...@@ -12,7 +12,7 @@ var requirejs, require, define;
(function (global) { (function (global) {
var req, s, head, baseElement, dataMain, src, var req, s, head, baseElement, dataMain, src,
interactiveScript, currentlyAddingScript, mainScript, subPath, interactiveScript, currentlyAddingScript, mainScript, subPath,
version = '2.1.18', version = '2.1.20',
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg, commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g, cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
jsSuffixRegExp = /\.js$/, jsSuffixRegExp = /\.js$/,
...@@ -21,7 +21,6 @@ var requirejs, require, define; ...@@ -21,7 +21,6 @@ var requirejs, require, define;
ostring = op.toString, ostring = op.toString,
hasOwn = op.hasOwnProperty, hasOwn = op.hasOwnProperty,
ap = Array.prototype, ap = Array.prototype,
apsp = ap.splice,
isBrowser = !!(typeof window !== 'undefined' && typeof navigator !== 'undefined' && window.document), isBrowser = !!(typeof window !== 'undefined' && typeof navigator !== 'undefined' && window.document),
isWebWorker = !isBrowser && typeof importScripts !== 'undefined', isWebWorker = !isBrowser && typeof importScripts !== 'undefined',
//PS3 indicates loaded and complete, but need to wait for complete //PS3 indicates loaded and complete, but need to wait for complete
...@@ -554,11 +553,13 @@ var requirejs, require, define; ...@@ -554,11 +553,13 @@ var requirejs, require, define;
function takeGlobalQueue() { function takeGlobalQueue() {
//Push all the globalDefQueue items into the context's defQueue //Push all the globalDefQueue items into the context's defQueue
if (globalDefQueue.length) { if (globalDefQueue.length) {
//Array splice in the values since the context code has a each(globalDefQueue, function(queueItem) {
//local var ref to defQueue, so cannot just reassign the one var id = queueItem[0];
//on context. if (typeof id === 'string') {
apsp.apply(defQueue, context.defQueueMap[id] = true;
[defQueue.length, 0].concat(globalDefQueue)); }
defQueue.push(queueItem);
});
globalDefQueue = []; globalDefQueue = [];
} }
} }
...@@ -845,7 +846,10 @@ var requirejs, require, define; ...@@ -845,7 +846,10 @@ var requirejs, require, define;
factory = this.factory; factory = this.factory;
if (!this.inited) { if (!this.inited) {
// Only fetch if not already in the defQueue.
if (!hasProp(context.defQueueMap, id)) {
this.fetch(); this.fetch();
}
} else if (this.error) { } else if (this.error) {
this.emit('error', this.error); this.emit('error', this.error);
} else if (!this.defining) { } else if (!this.defining) {
...@@ -1244,6 +1248,7 @@ var requirejs, require, define; ...@@ -1244,6 +1248,7 @@ var requirejs, require, define;
callGetModule(args); callGetModule(args);
} }
} }
context.defQueueMap = {};
} }
context = { context = {
...@@ -1253,6 +1258,7 @@ var requirejs, require, define; ...@@ -1253,6 +1258,7 @@ var requirejs, require, define;
defined: defined, defined: defined,
urlFetched: urlFetched, urlFetched: urlFetched,
defQueue: defQueue, defQueue: defQueue,
defQueueMap: {},
Module: Module, Module: Module,
makeModuleMap: makeModuleMap, makeModuleMap: makeModuleMap,
nextTick: req.nextTick, nextTick: req.nextTick,
...@@ -1502,6 +1508,7 @@ var requirejs, require, define; ...@@ -1502,6 +1508,7 @@ var requirejs, require, define;
defQueue.splice(i, 1); defQueue.splice(i, 1);
} }
}); });
delete context.defQueueMap[id];
if (mod) { if (mod) {
//Hold on to listeners in case the //Hold on to listeners in case the
...@@ -1563,6 +1570,7 @@ var requirejs, require, define; ...@@ -1563,6 +1570,7 @@ var requirejs, require, define;
callGetModule(args); callGetModule(args);
} }
context.defQueueMap = {};
//Do this after the cycle of callGetModule in case the result //Do this after the cycle of callGetModule in case the result
//of those calls/init calls changes the registry. //of those calls/init calls changes the registry.
...@@ -1857,6 +1865,9 @@ var requirejs, require, define; ...@@ -1857,6 +1865,9 @@ var requirejs, require, define;
if (isBrowser) { if (isBrowser) {
//In the browser so use a script tag //In the browser so use a script tag
node = req.createNode(config, moduleName, url); node = req.createNode(config, moduleName, url);
if (config.onNodeCreated) {
config.onNodeCreated(node, config, moduleName, url);
}
node.setAttribute('data-requirecontext', context.contextName); node.setAttribute('data-requirecontext', context.contextName);
node.setAttribute('data-requiremodule', moduleName); node.setAttribute('data-requiremodule', moduleName);
...@@ -2064,7 +2075,12 @@ var requirejs, require, define; ...@@ -2064,7 +2075,12 @@ var requirejs, require, define;
//where the module name is not known until the script onload event //where the module name is not known until the script onload event
//occurs. If no context, use the global queue, and get it processed //occurs. If no context, use the global queue, and get it processed
//in the onscript load callback. //in the onscript load callback.
(context ? context.defQueue : globalDefQueue).push([name, deps, callback]); if (context) {
context.defQueue.push([name, deps, callback]);
context.defQueueMap[name] = true;
} else {
globalDefQueue.push([name, deps, callback]);
}
}; };
define.amd = { define.amd = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment