From 94f469a6b107791c110a7039ed1c26d3b1ba6e02 Mon Sep 17 00:00:00 2001 From: Athou Date: Sun, 13 Oct 2013 10:49:03 +0200 Subject: [PATCH] js dependencies update --- src/main/webapp/WEB-INF/wro.xml | 10 +- src/main/webapp/js/main.js | 2 +- src/main/webapp/templates/_category.html | 2 +- src/main/webapp/templates/_footer.html | 2 +- .../templates/admin.duplicate_feeds.html | 4 +- .../templates/feeds.category_details.html | 10 +- src/main/webapp/templates/feeds.view.html | 28 +- .../vendor/angularui/angular-ui-0.4.0.min.js | 7 - .../vendor/angularui/angular-ui.min.css | 1 - .../webapp/vendor/nggrid/ng-grid-2.0.4.min.js | 2 - .../webapp/vendor/nggrid/ng-grid-2.0.7.min.js | 2 + src/main/webapp/vendor/nggrid/ng-grid.css | 472 -------------- src/main/webapp/vendor/nggrid/ng-grid.min.css | 1 + .../webapp/vendor/select2/select2-spinner.gif | Bin 0 -> 1849 bytes .../vendor/select2/select2.3.4.3.min.js | 22 + src/main/webapp/vendor/select2/select2.css | 615 ++++++++++++++++++ src/main/webapp/vendor/select2/select2.png | Bin 0 -> 613 bytes src/main/webapp/vendor/select2/select2x2.png | Bin 0 -> 845 bytes .../ui-bootstrap-tpls-0.2.0.min.js | 0 src/main/webapp/vendor/ui-select2/select2.js | 201 ++++++ .../angular-ui-states.min.js | 0 .../vendor/ui-utils/ui-utils.0.0.4.min.js | 7 + 22 files changed, 878 insertions(+), 510 deletions(-) delete mode 100644 src/main/webapp/vendor/angularui/angular-ui-0.4.0.min.js delete mode 100644 src/main/webapp/vendor/angularui/angular-ui.min.css delete mode 100644 src/main/webapp/vendor/nggrid/ng-grid-2.0.4.min.js create mode 100644 src/main/webapp/vendor/nggrid/ng-grid-2.0.7.min.js delete mode 100644 src/main/webapp/vendor/nggrid/ng-grid.css create mode 100644 src/main/webapp/vendor/nggrid/ng-grid.min.css create mode 100644 src/main/webapp/vendor/select2/select2-spinner.gif create mode 100644 src/main/webapp/vendor/select2/select2.3.4.3.min.js create mode 100644 src/main/webapp/vendor/select2/select2.css create mode 100644 src/main/webapp/vendor/select2/select2.png create mode 100644 src/main/webapp/vendor/select2/select2x2.png rename src/main/webapp/vendor/{angularui-bootstrap => ui-bootstrap}/ui-bootstrap-tpls-0.2.0.min.js (100%) create mode 100644 src/main/webapp/vendor/ui-select2/select2.js rename src/main/webapp/vendor/{angularui-state => ui-state}/angular-ui-states.min.js (100%) create mode 100644 src/main/webapp/vendor/ui-utils/ui-utils.0.0.4.min.js diff --git a/src/main/webapp/WEB-INF/wro.xml b/src/main/webapp/WEB-INF/wro.xml index baee14fc..6df37460 100644 --- a/src/main/webapp/WEB-INF/wro.xml +++ b/src/main/webapp/WEB-INF/wro.xml @@ -3,22 +3,24 @@ /vendor/jquery/*.js + /vendor/select2/*.js /vendor/lodash/*.js /vendor/jqueryui/*.js /vendor/jquery-mousewheel/*.js /vendor/bootstrap/*.js /vendor/angularjs/*.js - /vendor/angularui/*.js - /vendor/angularui-bootstrap/*.js - /vendor/angularui-state/*.js + /vendor/ui-utils/*.js + /vendor/ui-select2/*.js + /vendor/ui-bootstrap/*.js + /vendor/ui-state/*.js /vendor/mousetrap/*.js /vendor/nggrid/*.js /vendor/nginfinitescroll/*.js /vendor/spinjs/*.js /vendor/momentjs/*.js + /vendor/select2/*.css /vendor/bootstrap/*.css - /vendor/angularui/*.css /vendor/fontawesome/css/*.css /vendor/zocial/*.css /vendor/nggrid/*.css diff --git a/src/main/webapp/js/main.js b/src/main/webapp/js/main.js index 4fac279a..1b20aba1 100644 --- a/src/main/webapp/js/main.js +++ b/src/main/webapp/js/main.js @@ -1,4 +1,4 @@ -var app = angular.module('commafeed', ['ui', 'ui.bootstrap', 'ui.state', 'commafeed.directives', 'commafeed.controllers', +var app = angular.module('commafeed', ['ui.utils', 'ui.bootstrap', 'ui.state', 'ui.select2', 'commafeed.directives', 'commafeed.controllers', 'commafeed.services', 'commafeed.filters', 'ngSanitize', 'infinite-scroll', 'ngGrid']); app.config(['$routeProvider', '$stateProvider', '$urlRouterProvider', '$httpProvider', '$compileProvider', diff --git a/src/main/webapp/templates/_category.html b/src/main/webapp/templates/_category.html index 62f62af6..61a9a58d 100644 --- a/src/main/webapp/templates/_category.html +++ b/src/main/webapp/templates/_category.html @@ -1,5 +1,5 @@
  • -
    +