From cfc511c5d4eff898d5de32e7b9c56e322bc89779 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Tue, 6 May 2014 12:21:07 -0400 Subject: [PATCH] minification repairs; minor nits Signed-off-by: Bill Erickson --- Open-ILS/web/js/ui/default/staff/app.js | 10 ++++----- .../web/js/ui/default/staff/services/coresvc.js | 1 + Open-ILS/web/js/ui/default/staff/services/hatch.js | 2 +- Open-ILS/web/js/ui/default/staff/services/pcrud.js | 15 ++++--------- .../web/js/ui/default/staff/services/statusbar.js | 4 ++-- Open-ILS/web/js/ui/default/staff/services/ui.js | 26 +++++++++++++--------- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Open-ILS/web/js/ui/default/staff/app.js b/Open-ILS/web/js/ui/default/staff/app.js index bfe6542a6a..495d387bb8 100644 --- a/Open-ILS/web/js/ui/default/staff/app.js +++ b/Open-ILS/web/js/ui/default/staff/app.js @@ -6,7 +6,10 @@ angular.module('egHome', ['ngRoute', 'ui.bootstrap', 'egCoreMod', 'egUiMod']) -.config(function($routeProvider, $locationProvider) { +.config( + ['$routeProvider','$locationProvider', +function($routeProvider , $locationProvider) { + $locationProvider.html5Mode(true); /** * Route resolvers allow us to run async commands @@ -33,10 +36,7 @@ angular.module('egHome', ['ngRoute', 'ui.bootstrap', 'egCoreMod', 'egUiMod']) controller : 'SplashCtrl', resolve : resolver }); - - // HTML5 pushstate support - $locationProvider.html5Mode(true); -}) +}]) /** * Login controller. diff --git a/Open-ILS/web/js/ui/default/staff/services/coresvc.js b/Open-ILS/web/js/ui/default/staff/services/coresvc.js index 62f484040e..8bedf05e25 100644 --- a/Open-ILS/web/js/ui/default/staff/services/coresvc.js +++ b/Open-ILS/web/js/ui/default/staff/services/coresvc.js @@ -4,6 +4,7 @@ * Aggregates all core services into a container service. This allows * use of core services without having to inject each individually. */ + angular.module('egCoreMod') .factory('egCore', diff --git a/Open-ILS/web/js/ui/default/staff/services/hatch.js b/Open-ILS/web/js/ui/default/staff/services/hatch.js index 3f147dbadb..2366f71f13 100644 --- a/Open-ILS/web/js/ui/default/staff/services/hatch.js +++ b/Open-ILS/web/js/ui/default/staff/services/hatch.js @@ -472,7 +472,7 @@ angular.module('egCoreMod') template : '
', controller : ['$scope','$window','$timeout','egHatch', - function($scope , $window , $timeout, egHatch) { + function($scope , $window , $timeout , egHatch) { egHatch.onBrowserPrint = function(contentType, content) { switch(contentType) { diff --git a/Open-ILS/web/js/ui/default/staff/services/pcrud.js b/Open-ILS/web/js/ui/default/staff/services/pcrud.js index 7caec9ae35..54c91c3b5e 100644 --- a/Open-ILS/web/js/ui/default/staff/services/pcrud.js +++ b/Open-ILS/web/js/ui/default/staff/services/pcrud.js @@ -31,20 +31,13 @@ * resolver. The PCRUDContext object can be used to make subsequent * pcrud calls directly. * - * egPCRUD.connnect().then( - * function(ctx) { - * ctx.retrieve('aou', 1).then( - * function(org) { - * console.log(org.id()); - * ctx.disconnect(); - * } - * ) - * } - * ); + * egPCRUD.connnect() + * .then(function(ctx) { return ctx.retrieve('aou', 1) }) + * .then(function(org) { console.log(org.id()); ctx.disconnect() }) + * */ angular.module('egCoreMod') -// env fetcher .factory('egPCRUD', ['$q', 'egAuth', 'egIDL', function($q, egAuth, egIDL) { var service = {}; diff --git a/Open-ILS/web/js/ui/default/staff/services/statusbar.js b/Open-ILS/web/js/ui/default/staff/services/statusbar.js index 67704d9826..29968f9108 100644 --- a/Open-ILS/web/js/ui/default/staff/services/statusbar.js +++ b/Open-ILS/web/js/ui/default/staff/services/statusbar.js @@ -16,8 +16,8 @@ angular.module('egCoreMod') replace : true, templateUrl : 'eg-status-bar-template', controller : [ - '$scope', '$rootScope', 'egHatch', - function($scope, $rootScope, egHatch) { + '$scope','$rootScope','egHatch', + function($scope , $rootScope , egHatch) { $scope.messages = []; // keep a log of recent messages $scope.netConnected = function() { diff --git a/Open-ILS/web/js/ui/default/staff/services/ui.js b/Open-ILS/web/js/ui/default/staff/services/ui.js index c18080fe70..8abb2f3557 100644 --- a/Open-ILS/web/js/ui/default/staff/services/ui.js +++ b/Open-ILS/web/js/ui/default/staff/services/ui.js @@ -9,8 +9,8 @@ angular.module('egUiMod', ['egCoreMod', 'ui.bootstrap']) * $scope.iAmOpen = true; */ .directive('focusMe', -['$timeout', '$parse', -function($timeout, $parse) { + ['$timeout','$parse', +function($timeout , $parse) { return { link: function(scope, element, attrs) { var model = $parse(attrs.focusMe); @@ -31,8 +31,8 @@ function($timeout, $parse) { * Useful for de-focusing when no other obvious focus target exists */ .directive('blurMe', -['$timeout', '$parse', -function($timeout, $parse) { + ['$timeout','$parse', +function($timeout , $parse) { return { link: function(scope, element, attrs) { var model = $parse(attrs.blurMe); @@ -51,8 +51,8 @@ function($timeout, $parse) { // // $scope.iWantToBeSelected = true; .directive('selectMe', -['$timeout', '$parse', -function($timeout, $parse) { + ['$timeout','$parse', +function($timeout , $parse) { return { link: function(scope, element, attrs) { var model = $parse(attrs.selectMe); @@ -83,7 +83,10 @@ function($timeout, $parse) { * egAlertDialog.open({message : 'hello {{name}}'}).result.then( * function() { console.log('alert closed') }); */ -.factory('egAlertDialog', function($modal, $interpolate) { +.factory('egAlertDialog', + + ['$modal','$interpolate', +function($modal , $interpolate) { var service = {}; service.open = function(message, msg_scope) { @@ -102,13 +105,16 @@ function($timeout, $parse) { } return service; -}) +}]) /** * egConfirmDialog.open("some message goes {{here}}", { * here : 'foo', ok : function() {}, cancel : function() {}}); */ -.factory('egConfirmDialog', function($modal, $interpolate) { +.factory('egConfirmDialog', + + ['$modal','$interpolate', +function($modal, $interpolate) { var service = {}; service.open = function(title, message, msg_scope) { @@ -132,7 +138,7 @@ function($timeout, $parse) { } return service; -}) +}]) /** * Nested org unit selector modeled as a Bootstrap dropdown button. -- 2.11.0