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/25 17:20:58 UTC
[04/51] [abbrv] git commit: fix bug with analytics
fix bug with 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/f6c3d4aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f6c3d4aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f6c3d4aa
Branch: refs/heads/two-dot-o
Commit: f6c3d4aa2f464f46fe8c36bdce10f6e0852438c5
Parents: c1950d9
Author: Shawn Feldman <sh...@gmail.com>
Authored: Mon Mar 10 15:24:56 2014 -0600
Committer: Shawn Feldman <sh...@gmail.com>
Committed: Mon Mar 10 15:24:56 2014 -0600
----------------------------------------------------------------------
portal/index-debug.html | 16 ++++++++--------
portal/index.html | 16 ++++++++--------
portal/js/global/page-controller.js | 2 +-
portal/js/global/ug-service.js | 6 ++----
portal/js/libs/usergrid-libs.min.js | 2 +-
portal/js/usergrid-dev.min.js | 13 ++++---------
portal/js/usergrid.min.js | 8 ++++----
7 files changed, 28 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f6c3d4aa/portal/index-debug.html
----------------------------------------------------------------------
diff --git a/portal/index-debug.html b/portal/index-debug.html
index 7b8dcec..0aaf485 100644
--- a/portal/index-debug.html
+++ b/portal/index-debug.html
@@ -8,12 +8,12 @@
<meta name="description" content="">
<meta name="author" content="">
- <link id="libScript" href="2.0.36/js/libs/bootstrap/custom/css/bootstrap.min.css" rel="stylesheet">
- <link id="libScript" href="2.0.36/css/dash.min.css" rel="stylesheet">
+ <link id="libScript" href="2.0.0/js/libs/bootstrap/custom/css/bootstrap.min.css" rel="stylesheet">
+ <link id="libScript" href="2.0.0/css/dash.min.css" rel="stylesheet">
<!--styles for jquery ui calendar component-->
- <link id="libScript" rel="stylesheet" type="text/css" href="2.0.36/js/libs/jqueryui/jquery-ui-1.8.9.custom.css">
- <link id="libScript" rel="stylesheet" type="text/css" href="2.0.36/js/libs/jqueryui/jquery-ui-timepicker.css">
+ <link id="libScript" rel="stylesheet" type="text/css" href="2.0.0/js/libs/jqueryui/jquery-ui-1.8.9.custom.css">
+ <link id="libScript" rel="stylesheet" type="text/css" href="2.0.0/js/libs/jqueryui/jquery-ui-timepicker.css">
</head>
<body ng-controller="PageCtrl">
<!-- Google Tag Manager -->
@@ -115,14 +115,14 @@
</div>
</div>
</section>
-<script id="libScript" src="2.0.36/js/libs/usergrid-libs.min.js"></script>
-<script id="libScript" src="2.0.36/js/libs/bootstrap/custom/js/bootstrap.min.js"></script>
+<script id="libScript" src="2.0.0/js/libs/usergrid-libs.min.js"></script>
+<script id="libScript" src="2.0.0/js/libs/bootstrap/custom/js/bootstrap.min.js"></script>
<!--todo - remove this. temporarily including jquery ui for calendar in push-->
-<script id="libScript" src="2.0.36/js/libs/jqueryui/jquery.ui.timepicker.min.js" type="text/javascript"></script>
+<script id="libScript" src="2.0.0/js/libs/jqueryui/jquery.ui.timepicker.min.js" type="text/javascript"></script>
<!-- In dev use: <script src="js/libs/angular-1.1.5.js"></script> -->
<!--<script type="text/javascript" src="js/libs/angular-ui-ng-grid/ng-grid-2.0.2.debug.js"></script>-->
<script src="config.js"></script>
-<script id="main-script" src="2.0.36/js/usergrid-dev.min.js"></script>
+<script id="main-script" src="2.0.0/js/usergrid-dev.min.js"></script>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f6c3d4aa/portal/index.html
----------------------------------------------------------------------
diff --git a/portal/index.html b/portal/index.html
index 95b6eb8..6a00379 100644
--- a/portal/index.html
+++ b/portal/index.html
@@ -8,12 +8,12 @@
<meta name="description" content="">
<meta name="author" content="">
- <link id="libScript" href="2.0.36/js/libs/bootstrap/custom/css/bootstrap.min.css" rel="stylesheet">
- <link id="libScript" href="2.0.36/css/dash.min.css" rel="stylesheet">
+ <link id="libScript" href="2.0.0/js/libs/bootstrap/custom/css/bootstrap.min.css" rel="stylesheet">
+ <link id="libScript" href="2.0.0/css/dash.min.css" rel="stylesheet">
<!--styles for jquery ui calendar component-->
- <link id="libScript" rel="stylesheet" type="text/css" href="2.0.36/js/libs/jqueryui/jquery-ui-1.8.9.custom.css">
- <link id="libScript" rel="stylesheet" type="text/css" href="2.0.36/js/libs/jqueryui/jquery-ui-timepicker.css">
+ <link id="libScript" rel="stylesheet" type="text/css" href="2.0.0/js/libs/jqueryui/jquery-ui-1.8.9.custom.css">
+ <link id="libScript" rel="stylesheet" type="text/css" href="2.0.0/js/libs/jqueryui/jquery-ui-timepicker.css">
</head>
<body ng-controller="PageCtrl">
<!-- Google Tag Manager -->
@@ -115,14 +115,14 @@
</div>
</div>
</section>
-<script id="libScript" src="2.0.36/js/libs/usergrid-libs.min.js"></script>
-<script id="libScript" src="2.0.36/js/libs/bootstrap/custom/js/bootstrap.min.js"></script>
+<script id="libScript" src="2.0.0/js/libs/usergrid-libs.min.js"></script>
+<script id="libScript" src="2.0.0/js/libs/bootstrap/custom/js/bootstrap.min.js"></script>
<!--todo - remove this. temporarily including jquery ui for calendar in push-->
-<script id="libScript" src="2.0.36/js/libs/jqueryui/jquery.ui.timepicker.min.js" type="text/javascript"></script>
+<script id="libScript" src="2.0.0/js/libs/jqueryui/jquery.ui.timepicker.min.js" type="text/javascript"></script>
<!-- In dev use: <script src="js/libs/angular-1.1.5.js"></script> -->
<!--<script type="text/javascript" src="js/libs/angular-ui-ng-grid/ng-grid-2.0.2.debug.js"></script>-->
<script src="config.js"></script>
-<script id="main-script" src="2.0.36/js/usergrid.min.js"></script>
+<script id="main-script" src="2.0.0/js/usergrid.min.js"></script>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f6c3d4aa/portal/js/global/page-controller.js
----------------------------------------------------------------------
diff --git a/portal/js/global/page-controller.js b/portal/js/global/page-controller.js
index f8ed966..5de913b 100644
--- a/portal/js/global/page-controller.js
+++ b/portal/js/global/page-controller.js
@@ -11,7 +11,7 @@ AppServices.Controllers.controller('PageCtrl',
'$q',
'$route',
'$log',
- '$analytics', function (
+ function (
ug,
utility,
$scope,
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f6c3d4aa/portal/js/global/ug-service.js
----------------------------------------------------------------------
diff --git a/portal/js/global/ug-service.js b/portal/js/global/ug-service.js
index 95307b0..b9c1d3b 100644
--- a/portal/js/global/ug-service.js
+++ b/portal/js/global/ug-service.js
@@ -1,6 +1,6 @@
'use strict';
-AppServices.Services.factory('ug', function (configuration, $rootScope,utility, $q, $http, $resource, $log, $analytics,$location) {
+AppServices.Services.factory('ug', function (configuration, $rootScope,utility, $q, $http, $resource, $log,$location) {
var requestTimes = [],
running = false,
@@ -8,9 +8,7 @@ AppServices.Services.factory('ug', function (configuration, $rootScope,utility,
function reportError(data,config){
try {
- $analytics.eventTrack('error', {
- category: 'App Services', label: data + ':' + config.url + ':' + (sessionStorage['apigee_uuid'] || 'na')
- });
+
} catch (e) {
console.log(e)
}