fix module errors
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f0158369 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f0158369 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f0158369 Branch: refs/pull/27/head Commit: f0158369c59585d02d2a821aa69321707aab0e5f Parents: 2474350 Author: Shawn Feldman <[email protected]> Authored: Mon Mar 3 09:09:50 2014 -0700 Committer: Shawn Feldman <[email protected]> Committed: Mon Mar 3 09:09:50 2014 -0700 ---------------------------------------------------------------------- portal/config.js | 12 ------------ portal/index-debug.html | 4 ++-- portal/index.html | 4 ++-- portal/js/app.js | 4 +--- portal/js/libs/usergrid-libs.min.js | 2 +- portal/js/usergrid-dev.min.js | 9 ++++----- portal/js/usergrid.min.js | 8 ++++---- 7 files changed, 14 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f0158369/portal/config.js ---------------------------------------------------------------------- diff --git a/portal/config.js b/portal/config.js index a78d776..c2f31d1 100644 --- a/portal/config.js +++ b/portal/config.js @@ -2,7 +2,6 @@ var Usergrid = Usergrid || {}; Usergrid.showNotifcations = true; - // used only if hostname does not match a real server name Usergrid.overrideUrl = 'https://api.usergrid.com/'; @@ -74,17 +73,6 @@ Usergrid.regex = { stateRegexDescription: "Sorry only alphabetical characters or spaces are allowed. Must be between 2-100 characters.", collectionNameRegexDescription: "Collection name only allows : a-z A-Z 0-9. Must be between 3-25 characters." }; - -//Performance -Usergrid.options.scriptReferences.dev.push('bower_components/apigee.performance.ui/dist/js/usergrid-perf-dev.min.js'); -Usergrid.options.scriptReferences.main.push('bower_components/apigee.performance.ui/dist/js/usergrid-perf.min.js'); -Usergrid.options.cssRefs.push({id:'perf-css',src:'bower_components/apigee.performance.ui/dist/css/performance.min.css'}); -//End Performance -//Push -Usergrid.options.scriptReferences.dev.push('bower_components/apigee.push.ui/dist/js/usergrid-push-dev.min.js'); -Usergrid.options.scriptReferences.main.push('bower_components/apigee.push.ui/dist/js/usergrid-push.min.js'); -Usergrid.options.cssRefs.push({id:'push-css',src:'bower_components/apigee.push.ui/dist/css/push.min.css'}); -//End Push try{ if(module && module.exports){ module.exports = Usergrid; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f0158369/portal/index-debug.html ---------------------------------------------------------------------- diff --git a/portal/index-debug.html b/portal/index-debug.html index 39395f7..8aea400 100644 --- a/portal/index-debug.html +++ b/portal/index-debug.html @@ -14,7 +14,7 @@ <!--styles for jquery ui calendar component--> <link id="libScript" rel="stylesheet" type="text/css" href="2.0.34/js/libs/jqueryui/jquery-ui-1.8.9.custom.css"> <link id="libScript" rel="stylesheet" type="text/css" href="2.0.34/js/libs/jqueryui/jquery-ui-timepicker.css"> -<link href="2.0.34/bower_components/apigee.performance.ui/dist/css/performance.min.css" rel="stylesheet" id="perf-css"><link href="2.0.34/bower_components/apigee.push.ui/dist/css/push.min.css" rel="stylesheet" id="push-css"></head> +</head> <body ng-controller="PageCtrl"> <!-- Google Tag Manager --> <noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-N52333" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript> @@ -124,5 +124,5 @@ <script src="config.js"></script> <script id="main-script" src="2.0.34/js/usergrid-dev.min.js"></script> -<script src="2.0.34/bower_components/apigee.performance.ui/dist/js/usergrid-perf-dev.min.js"></script><script src="2.0.34/bower_components/apigee.push.ui/dist/js/usergrid-push-dev.min.js"></script></body> +</body> </html> http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f0158369/portal/index.html ---------------------------------------------------------------------- diff --git a/portal/index.html b/portal/index.html index 4e36ada..2285ff5 100644 --- a/portal/index.html +++ b/portal/index.html @@ -14,7 +14,7 @@ <!--styles for jquery ui calendar component--> <link id="libScript" rel="stylesheet" type="text/css" href="2.0.34/js/libs/jqueryui/jquery-ui-1.8.9.custom.css"> <link id="libScript" rel="stylesheet" type="text/css" href="2.0.34/js/libs/jqueryui/jquery-ui-timepicker.css"> -<link href="2.0.34/bower_components/apigee.performance.ui/dist/css/performance.min.css" rel="stylesheet" id="perf-css"><link href="2.0.34/bower_components/apigee.push.ui/dist/css/push.min.css" rel="stylesheet" id="push-css"></head> +</head> <body ng-controller="PageCtrl"> <!-- Google Tag Manager --> <noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-N52333" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript> @@ -124,5 +124,5 @@ <script src="config.js"></script> <script id="main-script" src="2.0.34/js/usergrid.min.js"></script> -<script src="2.0.34/bower_components/apigee.performance.ui/dist/js/usergrid-perf.min.js"></script><script src="2.0.34/bower_components/apigee.push.ui/dist/js/usergrid-push.min.js"></script></body> +</body> </html> http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f0158369/portal/js/app.js ---------------------------------------------------------------------- diff --git a/portal/js/app.js b/portal/js/app.js index b097f12..9ed6816 100644 --- a/portal/js/app.js +++ b/portal/js/app.js @@ -51,7 +51,6 @@ AppServices.Services = angular.module('appservices.services', []); AppServices.Controllers = angular.module('appservices.controllers', []); AppServices.Filters = angular.module('appservices.filters', []); AppServices.Directives = angular.module('appservices.directives', []); -AppServices.Push = angular.module('appservices.push', []); angular.module('appservices', [ 'ngRoute', @@ -63,8 +62,7 @@ angular.module('appservices', 'appservices.directives', 'appservices.constants', 'appservices.controllers', - 'appservices.performance', - 'appservices.push' + ]).config(['$routeProvider', '$locationProvider','$sceDelegateProvider', function ($routeProvider,$locationProvider,$sceDelegateProvider) { $routeProvider
