usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [39/41] git commit: fix forgot password and remove google analytics
Date Mon, 24 Feb 2014 07:21:34 GMT
fix forgot password and remove google analytics


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/47bce9df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/47bce9df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/47bce9df

Branch: refs/pull/55/merge
Commit: 47bce9df699dd07608fcf79e632785009519e425
Parents: 2c4af65
Author: Shawn Feldman <shawn.feldman@gmail.com>
Authored: Thu Feb 20 14:02:19 2014 -0700
Committer: Shawn Feldman <shawn.feldman@gmail.com>
Committed: Thu Feb 20 14:02:19 2014 -0700

----------------------------------------------------------------------
 portal/config.js                              | 15 ---------------
 portal/js/login/forgot-password-controller.js |  6 ++++--
 2 files changed, 4 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/47bce9df/portal/config.js
----------------------------------------------------------------------
diff --git a/portal/config.js b/portal/config.js
index 3f0010e..a78d776 100644
--- a/portal/config.js
+++ b/portal/config.js
@@ -1,20 +1,5 @@
 var Usergrid = Usergrid || {};
 
-//Google Analytics
-var _gaq = _gaq || [];
-_gaq.push(['_setAccount', 'UA-4084158-4']);
-try{
-    (function(document) {
-        if(!document){
-            return;
-        }
-        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async
= true;
-        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www')
+ '.google-analytics.com/ga.js';
-        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga,
s);
-    })(document || null);
-}catch(e){};
-//End Google Analytics
-
 Usergrid.showNotifcations = true;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/47bce9df/portal/js/login/forgot-password-controller.js
----------------------------------------------------------------------
diff --git a/portal/js/login/forgot-password-controller.js b/portal/js/login/forgot-password-controller.js
index bf5fc08..ece3082 100644
--- a/portal/js/login/forgot-password-controller.js
+++ b/portal/js/login/forgot-password-controller.js
@@ -1,11 +1,13 @@
 'use strict'
 
+
 AppServices.Controllers.controller('ForgotPasswordCtrl',
   ['ug',
     '$scope',
     '$rootScope',
     '$location',
-    'utility', function (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');
   }]);


Mime
View raw message