Skip to content

N
nexpie-grafana-theme
Commit e95170e9 by Torkel Ödegaard
Options

tech(angularjs): upgrade to angularjs 1.5

parent 71d718a6
Showing with 55 additions and 145 deletions
bower.json
......@@ -14,13 +14,10 @@
],
"dependencies": {
"jquery": "~2.1.4",
"angular": "~1.4.3",
"angular-route": "~1.4.3",
"angular-mocks": "~1.4.3",
"angular-sanitize": "~1.4.3",
"angular-native-dragdrop": "~1.1.1",
"angular-bindonce": "~0.3.3",
"requirejs": "~2.1.18",
"requirejs-text": "~2.0.14"
"angular": "~1.5.0",
"angular-route": "~1.5.0",
"angular-mocks": "~1.5.0",
"angular-sanitize": "~1.5.0",
"angular-bindonce": "~0.3.3"
}
}
public/app/require_config.js deleted 100644 → 0
require.config({
urlArgs: 'bust=' + (new Date().getTime()),
baseUrl: 'public',
paths: {
'lodash-src': 'vendor/lodash',
lodash: 'app/core/lodash_extended',
text: 'vendor/requirejs-text/text',
moment: 'vendor/moment',
angular: 'vendor/angular/angular',
'angular-route': 'vendor/angular-route/angular-route',
'angular-sanitize': 'vendor/angular-sanitize/angular-sanitize',
'angular-dragdrop': 'vendor/angular-native-dragdrop/draganddrop',
'angular-strap': 'vendor/angular-other/angular-strap',
'angular-ui': 'vendor/angular-ui/ui-bootstrap-tpls',
timepicker: 'vendor/angular-other/timepicker',
datepicker: 'vendor/angular-other/datepicker',
bindonce: 'vendor/angular-bindonce/bindonce',
crypto: 'vendor/crypto.min',
spectrum: 'vendor/spectrum',
bootstrap: 'vendor/bootstrap/bootstrap',
jquery: 'vendor/jquery/dist/jquery',
'jquery.flot': 'vendor/flot/jquery.flot',
'jquery.flot.pie': 'vendor/flot/jquery.flot.pie',
'jquery.flot.events': 'vendor/flot/jquery.flot.events',
'jquery.flot.selection': 'vendor/flot/jquery.flot.selection',
'jquery.flot.stack': 'vendor/flot/jquery.flot.stack',
'jquery.flot.stackpercent':'vendor/flot/jquery.flot.stackpercent',
'jquery.flot.time': 'vendor/flot/jquery.flot.time',
'jquery.flot.crosshair': 'vendor/flot/jquery.flot.crosshair',
'jquery.flot.fillbelow': 'vendor/flot/jquery.flot.fillbelow',
modernizr: 'vendor/modernizr-2.6.1',
'bootstrap-tagsinput': 'vendor/tagsinput/bootstrap-tagsinput',
},
shim: {
spectrum: {
deps: ['jquery']
},
crypto: {
exports: 'Crypto'
},
angular: {
deps: ['jquery'],
exports: 'angular'
},
bootstrap: {
deps: ['jquery']
},
modernizr: {
exports: 'Modernizr'
},
jquery: {
exports: 'jQuery'
},
// simple dependency declaration
//
'jquery.flot': ['jquery'],
'jquery.flot.pie': ['jquery', 'jquery.flot'],
'jquery.flot.events': ['jquery', 'jquery.flot'],
'jquery.flot.selection':['jquery', 'jquery.flot'],
'jquery.flot.stack': ['jquery', 'jquery.flot'],
'jquery.flot.stackpercent':['jquery', 'jquery.flot'],
'jquery.flot.time': ['jquery', 'jquery.flot'],
'jquery.flot.crosshair':['jquery', 'jquery.flot'],
'jquery.flot.fillbelow':['jquery', 'jquery.flot'],
'angular-dragdrop': ['jquery', 'angular'],
'angular-mocks': ['angular'],
'angular-sanitize': ['angular'],
'angular-ui': ['angular'],
'angular-route': ['angular'],
'angular-strap': ['angular', 'bootstrap','timepicker', 'datepicker'],
'bindonce': ['angular'],
timepicker: ['jquery', 'bootstrap'],
datepicker: ['jquery', 'bootstrap'],
'bootstrap-tagsinput': ['jquery'],
},
});
public/vendor/angular-mocks/.bower.json
{
"name": "angular-mocks",
"version": "1.4.3",
"version": "1.5.0-rc.0",
"main": "./angular-mocks.js",
"ignore": [],
"dependencies": {
"angular": "1.4.3"
"angular": "1.5.0-rc.0"
},
"homepage": "https://github.com/angular/bower-angular-mocks",
"_release": "1.4.3",
"_release": "1.5.0-rc.0",
"_resolution": {
"type": "version",
"tag": "v1.4.3",
"commit": "7e3beec84afceeb060a3c6def0d7ca965727851c"
"tag": "v1.5.0-rc.0",
"commit": "aaa4993ea1fa4aac97953d65bcaeb5f6eda6f113"
},
"_source": "git://github.com/angular/bower-angular-mocks.git",
"_target": "~1.4.3",
"_target": "~1.5.0",
"_originalSource": "angular-mocks"
}
\ No newline at end of file
public/vendor/angular-mocks/bower.json
{
"name": "angular-mocks",
"version": "1.4.3",
"version": "1.5.0-rc.0",
"main": "./angular-mocks.js",
"ignore": [],
"dependencies": {
"angular": "1.4.3"
"angular": "1.5.0-rc.0"
}
}
public/vendor/angular-mocks/package.json
{
"name": "angular-mocks",
"version": "1.4.3",
"version": "1.5.0-rc.0",
"description": "AngularJS mocks for testing",
"main": "angular-mocks.js",
"scripts": {
......
public/vendor/angular-route/.bower.json
{
"name": "angular-route",
"version": "1.4.3",
"version": "1.5.0-rc.0",
"main": "./angular-route.js",
"ignore": [],
"dependencies": {
"angular": "1.4.3"
"angular": "1.5.0-rc.0"
},
"homepage": "https://github.com/angular/bower-angular-route",
"_release": "1.4.3",
"_release": "1.5.0-rc.0",
"_resolution": {
"type": "version",
"tag": "v1.4.3",
"commit": "6d34da91a291260d1826c42f163ac21d094cc0fc"
"tag": "v1.5.0-rc.0",
"commit": "496e2f35541957c1e4903b99622be5bcdb058a7a"
},
"_source": "git://github.com/angular/bower-angular-route.git",
"_target": "~1.4.3",
"_target": "~1.5.0",
"_originalSource": "angular-route"
}
\ No newline at end of file
public/vendor/angular-route/angular-route.js
/**
* @license AngularJS v1.4.3
* @license AngularJS v1.5.0-rc.0
* (c) 2010-2015 Google, Inc. http://angularjs.org
* License: MIT
*/
......@@ -796,7 +796,6 @@ ngRouteModule.directive('ngView', ngViewFillContentFactory);
}
.view-animate.ng-enter, .view-animate.ng-leave {
-webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 1.5s;
transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 1.5s;
display:block;
......@@ -982,6 +981,7 @@ function ngViewFillContentFactory($compile, $controller, $route) {
$element.data('$ngControllerController', controller);
$element.children().data('$ngControllerController', controller);
}
scope[current.resolveAs || '$resolve'] = locals;
link(scope);
}
......
public/vendor/angular-route/angular-route.min.js
/*
AngularJS v1.4.3
AngularJS v1.5.0-rc.0
(c) 2010-2015 Google, Inc. http://angularjs.org
License: MIT
*/
(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");
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 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);
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=(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=
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 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+)(?:[?*])?(.*)/),
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{}}});
p.directive("ngView",v);p.directive("ngView",A);v.$inject=["$route","$anchorScroll","$animate"];A.$inject=["$compile","$controller","$route"]})(window,window.angular);
(function(r,d,C){'use strict';function w(s,h,g){return{restrict:"ECA",terminal:!0,priority:400,transclude:"element",link:function(a,c,b,f,y){function k(){n&&(g.cancel(n),n=null);l&&(l.$destroy(),l=null);m&&(n=g.leave(m),n.then(function(){n=null}),m=null)}function z(){var b=s.current&&s.current.locals;if(d.isDefined(b&&b.$template)){var b=a.$new(),f=s.current;m=y(b,function(b){g.enter(b,null,m||c).then(function(){!d.isDefined(u)||u&&!a.$eval(u)||h()});k()});l=f.scope=b;l.$emit("$viewContentLoaded");
l.$eval(x)}else k()}var l,m,n,u=b.autoscroll,x=b.onload||"";a.$on("$routeChangeSuccess",z);z()}}}function A(d,h,g){return{restrict:"ECA",priority:-400,link:function(a,c){var b=g.current,f=b.locals;c.html(f.$template);var y=d(c.contents());if(b.controller){f.$scope=a;var k=h(b.controller,f);b.controllerAs&&(a[b.controllerAs]=k);c.data("$ngControllerController",k);c.children().data("$ngControllerController",k)}a[b.resolveAs||"$resolve"]=f;y(a)}}}r=d.module("ngRoute",["ng"]).provider("$route",function(){function s(a,
c){return d.extend(Object.create(a),c)}function h(a,d){var b=d.caseInsensitiveMatch,f={originalPath:a,regexp:a},g=f.keys=[];a=a.replace(/([().])/g,"\\$1").replace(/(\/)?:(\w+)([\?\*])?/g,function(a,d,b,c){a="?"===c?c:null;c="*"===c?c:null;g.push({name:b,optional:!!a});d=d||"";return""+(a?"":d)+"(?:"+(a?d:"")+(c&&"(.+?)"||"([^/]+)")+(a||"")+")"+(a||"")}).replace(/([\/$\*])/g,"\\$1");f.regexp=new RegExp("^"+a+"$",b?"i":"");return f}var g={};this.when=function(a,c){var b=d.copy(c);d.isUndefined(b.reloadOnSearch)&&
(b.reloadOnSearch=!0);d.isUndefined(b.caseInsensitiveMatch)&&(b.caseInsensitiveMatch=this.caseInsensitiveMatch);g[a]=d.extend(b,a&&h(a,b));if(a){var f="/"==a[a.length-1]?a.substr(0,a.length-1):a+"/";g[f]=d.extend({redirectTo:a},h(f,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,c,b,f,h,k,r){function l(b){var e=
t.current;(w=(p=n())&&e&&p.$$route===e.$$route&&d.equals(p.pathParams,e.pathParams)&&!p.reloadOnSearch&&!x)||!e&&!p||a.$broadcast("$routeChangeStart",p,e).defaultPrevented&&b&&b.preventDefault()}function m(){var v=t.current,e=p;if(w)v.params=e.params,d.copy(v.params,b),a.$broadcast("$routeUpdate",v);else if(e||v)x=!1,(t.current=e)&&e.redirectTo&&(d.isString(e.redirectTo)?c.path(u(e.redirectTo,e.params)).search(e.params).replace():c.url(e.redirectTo(e.pathParams,c.path(),c.search())).replace()),f.when(e).then(function(){if(e){var a=
d.extend({},e.resolve),b,c;d.forEach(a,function(b,e){a[e]=d.isString(b)?h.get(b):h.invoke(b,null,null,e)});d.isDefined(b=e.template)?d.isFunction(b)&&(b=b(e.params)):d.isDefined(c=e.templateUrl)&&(d.isFunction(c)&&(c=c(e.params)),d.isDefined(c)&&(e.loadedTemplateUrl=r.valueOf(c),b=k(c)));d.isDefined(b)&&(a.$template=b);return f.all(a)}}).then(function(c){e==t.current&&(e&&(e.locals=c,d.copy(e.params,b)),a.$broadcast("$routeChangeSuccess",e,v))},function(b){e==t.current&&a.$broadcast("$routeChangeError",
e,v,b)})}function n(){var a,b;d.forEach(g,function(f,g){var q;if(q=!b){var h=c.path();q=f.keys;var l={};if(f.regexp)if(h=f.regexp.exec(h)){for(var k=1,n=h.length;k<n;++k){var m=q[k-1],p=h[k];m&&p&&(l[m.name]=p)}q=l}else q=null;else q=null;q=a=q}q&&(b=s(f,{params:d.extend({},c.search(),a),pathParams:a}),b.$$route=f)});return b||g[null]&&s(g[null],{params:{},pathParams:{}})}function u(a,b){var c=[];d.forEach((a||"").split(":"),function(a,d){if(0===d)c.push(a);else{var f=a.match(/(\w+)(?:[?*])?(.*)/),
g=f[1];c.push(b[g]);c.push(f[2]||"");delete b[g]}});return c.join("")}var x=!1,p,w,t={routes:g,reload:function(){x=!0;a.$evalAsync(function(){l();m()})},updateParams:function(a){if(this.current&&this.current.$$route)a=d.extend({},this.current.params,a),c.path(u(this.current.$$route.originalPath,a)),c.search(a);else throw B("norout");}};a.$on("$locationChangeStart",l);a.$on("$locationChangeSuccess",m);return t}]});var B=d.$$minErr("ngRoute");r.provider("$routeParams",function(){this.$get=function(){return{}}});
r.directive("ngView",w);r.directive("ngView",A);w.$inject=["$route","$anchorScroll","$animate"];A.$inject=["$compile","$controller","$route"]})(window,window.angular);
//# sourceMappingURL=angular-route.min.js.map
public/vendor/angular-route/bower.json
{
"name": "angular-route",
"version": "1.4.3",
"version": "1.5.0-rc.0",
"main": "./angular-route.js",
"ignore": [],
"dependencies": {
"angular": "1.4.3"
"angular": "1.5.0-rc.0"
}
}
public/vendor/angular-route/package.json
{
"name": "angular-route",
"version": "1.4.3",
"version": "1.5.0-rc.0",
"description": "AngularJS router module",
"main": "index.js",
"scripts": {
......
public/vendor/angular-sanitize/.bower.json
{
"name": "angular-sanitize",
"version": "1.4.3",
"version": "1.5.0-rc.0",
"main": "./angular-sanitize.js",
"ignore": [],
"dependencies": {
"angular": "1.4.3"
"angular": "1.5.0-rc.0"
},
"homepage": "https://github.com/angular/bower-angular-sanitize",
"_release": "1.4.3",
"_release": "1.5.0-rc.0",
"_resolution": {
"type": "version",
"tag": "v1.4.3",
"commit": "0367ee4c3f9cb8af5d1da9ec35b71a8b523d9fc0"
"tag": "v1.5.0-rc.0",
"commit": "e908c5b56ec6e5fee07d6364de1899407e33643b"
},
"_source": "git://github.com/angular/bower-angular-sanitize.git",
"_target": "~1.4.3",
"_target": "~1.5.0",
"_originalSource": "angular-sanitize"
}
\ No newline at end of file
public/vendor/angular-sanitize/bower.json
{
"name": "angular-sanitize",
"version": "1.4.3",
"version": "1.5.0-rc.0",
"main": "./angular-sanitize.js",
"ignore": [],
"dependencies": {
"angular": "1.4.3"
"angular": "1.5.0-rc.0"
}
}
public/vendor/angular-sanitize/package.json
{
"name": "angular-sanitize",
"version": "1.4.3",
"version": "1.5.0-rc.0",
"description": "AngularJS module for sanitizing HTML",
"main": "index.js",
"scripts": {
......
public/vendor/angular/.bower.json
{
"name": "angular",
"version": "1.4.3",
"version": "1.5.0-rc.0",
"main": "./angular.js",
"ignore": [],
"dependencies": {},
"homepage": "https://github.com/angular/bower-angular",
"_release": "1.4.3",
"_release": "1.5.0-rc.0",
"_resolution": {
"type": "version",
"tag": "v1.4.3",
"commit": "dbd689e8103a6366e53e1f6786727f7c65ccfd75"
"tag": "v1.5.0-rc.0",
"commit": "7ca341e6db77f5d8d93228335347b193a7af25c5"
},
"_source": "git://github.com/angular/bower-angular.git",
"_target": "~1.4.3",
"_target": "1.5.0-rc.0",
"_originalSource": "angular"
}
\ No newline at end of file
public/vendor/angular/angular.js
This source diff could not be displayed because it is too large. You can view the blob instead.
public/vendor/angular/angular.min.js
This source diff could not be displayed because it is too large. You can view the blob instead.
public/vendor/angular/angular.min.js.map
This source diff could not be displayed because it is too large. You can view the blob instead.
public/vendor/angular/bower.json
{
"name": "angular",
"version": "1.4.3",
"version": "1.5.0-rc.0",
"main": "./angular.js",
"ignore": [],
"dependencies": {
......
public/vendor/angular/package.json
{
"name": "angular",
"version": "1.4.3",
"version": "1.5.0-rc.0",
"description": "HTML enhanced for web apps",
"main": "index.js",
"scripts": {
......
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