You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/03/03 18:20:41 UTC
[2/5] fix module errors
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f0158369/portal/js/usergrid-dev.min.js
----------------------------------------------------------------------
diff --git a/portal/js/usergrid-dev.min.js b/portal/js/usergrid-dev.min.js
index a181769..fbbf56d 100644
--- a/portal/js/usergrid-dev.min.js
+++ b/portal/js/usergrid-dev.min.js
@@ -1,4 +1,4 @@
-/*! apigee-usergrid@2.0.34 2014-02-20 */
+/*! apigee-usergrid@2.0.34 2014-03-03 */
(function(exports, global) {
global["true"] = exports;
"use strict";
@@ -42,8 +42,7 @@
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", "ngResource", "ngSanitize", "ui.bootstrap", "appservices.filters", "appservices.services", "appservices.directives", "appservices.constants", "appservices.controllers", "appservices.performance", "appservices.push" ]).config([ "$routeProvider", "$locationProvider", "$sceDelegateProvider", function($routeProvider, $locationProvider, $sceDelegateProvider) {
+ angular.module("appservices", [ "ngRoute", "ngResource", "ngSanitize", "ui.bootstrap", "appservices.filters", "appservices.services", "appservices.directives", "appservices.constants", "appservices.controllers" ]).config([ "$routeProvider", "$locationProvider", "$sceDelegateProvider", function($routeProvider, $locationProvider, $sceDelegateProvider) {
$routeProvider.when("/org-overview", {
templateUrl: "org-overview/org-overview.html",
controller: "OrgOverviewCtrl"
@@ -3164,9 +3163,9 @@
}
} ]);
"use strict";
- AppServices.Controllers.controller("ForgotPasswordCtrl", [ "ug", "$scope", "$rootScope", "$location", "utility", function(ug, $scope, $rootScope, $location) {
+ AppServices.Controllers.controller("ForgotPasswordCtrl", [ "ug", "$scope", "$rootScope", "$location", "$sce", "utility", function(ug, $scope, $rootScope, $location, $sce) {
$rootScope.activeUI && $location.path("/");
- $scope.forgotPWiframeURL = $scope.apiUrl + "/management/users/resetpw";
+ $scope.forgotPWiframeURL = $sce.trustAsResourceUrl($scope.apiUrl + "/management/users/resetpw");
} ]);
"use strict";
AppServices.Controllers.controller("LoginCtrl", [ "ug", "$scope", "$rootScope", "$routeParams", "$location", "utility", function(ug, $scope, $rootScope, $routeParams, $location, utility) {