From: Galen Charlton <gmc@esilibrary.com>
Date: Wed, 20 Apr 2016 14:59:57 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/master' into angular1_5_1
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=5b30b75be8421b4148a430aee0c3d4008cfba1c9;p=working%2FEvergreen.git

Merge remote-tracking branch 'origin/master' into angular1_5_1

Conflicts:
	Open-ILS/web/js/ui/default/staff/bower.json
	Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
---

5b30b75be8421b4148a430aee0c3d4008cfba1c9
diff --cc Open-ILS/src/templates/staff/share/t_autogrid.tt2
index e94f003357,e96e2fbfc9..82fa3b2bf9
--- a/Open-ILS/src/templates/staff/share/t_autogrid.tt2
+++ b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
@@@ -9,13 -9,13 +9,13 @@@
    <div class="eg-grid-primary-label">{{mainLabel}}</div>
  
    <div class="btn-group" 
 -    is-open="gridMenuIsOpen" ng-if="menuLabel && showMenu" dropdown>
 -    <button type="button" class="btn btn-default dropdown-toggle eg-grid-menu-item">
 +    is-open="gridMenuIsOpen" ng-if="menuLabel && showMenu" uib-dropdown>
 +    <button type="button" class="btn btn-default eg-grid-menu-item" uib-dropdown-toggle>
        {{menuLabel}}<span class="caret"></span>
      </button>
 -    <ul class="dropdown-menu scrollable-menu">
 +    <ul class="scrollable-menu" uib-dropdown-menu>
        <li ng-repeat="item in menuItems | filter : { standalone : 'false' }" ng-class="{divider: item.divider}">
-         <a ng-if="!item.divider" href ng-disabled="item.disabled"
+         <a ng-if="!item.divider" href a-disabled="item.disabled()"
            ng-click="item.handler()">{{item.label}}</a>
        </li>
      </ul>
diff --cc Open-ILS/web/js/ui/default/staff/bower.json
index d7fae46e05,052978c31a..46444af06d
--- a/Open-ILS/web/js/ui/default/staff/bower.json
+++ b/Open-ILS/web/js/ui/default/staff/bower.json
@@@ -17,15 -17,20 +17,18 @@@
      "test",
      "tests"
    ],
 -  "devDependencies": {
 -    "bootstrap": "~3.1.1",
 -    "jquery": "~2.1.3",
 -    "angular": "~1.2.16",
 -    "angular-route": "~1.2.16",
 -    "angular-mocks": "~1.2.16",
 -    "angular-bootstrap": "~0.11.0"
 -  },
    "dependencies": {
 -    "angular-hotkeys": "chieffancypants/angular-hotkeys#~1.3.0",
 -    "angular-location-update": "./extern/angular-location-update/",
 -    "angular-file-saver": "~1.0.2",
 +    "AngularJS": "angular-latest#~1.5.0",
 +    "jquery": "~2.2.1",
 +    "bootstrap": "~3.3.6",
 +    "angular-route": "~1.5.0",
 +    "angular-mocks": "~1.5.0",
 +    "angular-bootstrap": "~1.2.4",
 +    "angular-hotkeys": "~0.2.2",
 +    "angular-file-saver": "~1.1.0",
-     "angular-location-update": "~0.0.2"
++    "angular-location-update": "~0.0.2",
+     "ngtoast": "~2.0.0",
+     "angular-tree-control": "~0.2.23",
+     "angular-animate": "~1.5.3"
    }
  }
diff --cc Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
index 487e67ef7c,a635b9ca78..daf843d1ae
--- a/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
@@@ -230,10 -237,10 +237,10 @@@ function($scope , $routeParams , $locat
  }])
  
  .controller('CatalogCtrl',
-        ['$scope','$routeParams','$location','$window','$q','egCore','egHolds','egCirc','egConfirmDialog',
 -       ['$scope','$routeParams','$location','$window','$q','egCore','egHolds','egCirc','egConfirmDialog','ngToast',
 -        'egGridDataProvider','egHoldGridActions','$timeout','$modal','holdingsSvc','egUser','conjoinedSvc',
 -function($scope , $routeParams , $location , $window , $q , egCore , egHolds , egCirc , egConfirmDialog , ngToast ,
 -         egGridDataProvider , egHoldGridActions , $timeout , $modal , holdingsSvc , egUser , conjoinedSvc) {
++       ['$scope','$routeParams','$location','$window','$q','egCore','egHolds','egCirc','egConfirmDialog', 'ngToast',
 +        'egGridDataProvider','egHoldGridActions','$timeout','$uibModal','holdingsSvc','egUser','conjoinedSvc',
- function($scope , $routeParams , $location , $window , $q , egCore , egHolds , egCirc,  egConfirmDialog,
++function($scope , $routeParams , $location , $window , $q , egCore , egHolds , egCirc,  egConfirmDialog, ngToast,
 +         egGridDataProvider , egHoldGridActions , $timeout , $uibModal , holdingsSvc , egUser , conjoinedSvc) {
  
      var holdingsSvcInst = new holdingsSvc();