girder-google-analytics 3.2.3.dev23__tar.gz → 3.2.4.dev5__tar.gz

{girder-google-analytics-3.2.3.dev23 → girder-google-analytics-3.2.4.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: girder-google-analytics
-Version: 3.2.3.dev23
+Version: 3.2.4.dev5
 Summary: Allow the tracking of page views via Google Analytics.
 Home-page: http://girder.readthedocs.io/en/latest/plugins.html#google-analytics
 Author: Kitware, Inc.

girder-google-analytics-3.2.4.dev5/girder_google_analytics/web_client/main.js

@@ -0,0 +1,63 @@
+import $ from 'jquery';
+
+import events from '@girder/core/events';
+import { restRequest } from '@girder/core/rest';
+
+import './routes';
+
+function initGoogleAnalytics() {
+    restRequest({
+        method: 'GET',
+        url: 'google_analytics/id'
+    }).done((resp) => {
+        if (resp.google_analytics_id) {
+            const googleAnalyticsId = resp.google_analytics_id;
+
+            $.getScript({
+                url: `https://www.googletagmanager.com/gtag/js?id=${googleAnalyticsId}`,
+                success: function () {
+                    window.dataLayer = window.dataLayer || [];
+                    function gtag() {
+                        dataLayer.push(arguments); // eslint-disable-line no-undef
+                    }
+                    gtag('js', new Date());
+                    gtag('config', googleAnalyticsId);
+                    window.gtag = gtag;
+                }
+            });
+        }
+    });
+}
+
+events.on('g:appload.after', function () {
+    var dnt = navigator.doNotTrack || window.doNotTrack;
+    if (dnt !== '1' && dnt !== 'yes') {
+        initGoogleAnalytics();
+    }
+});
+
+events.on('g:google_analytics.save', function () {
+    initGoogleAnalytics();
+});
+
+/**
+ * Add analytics for the hierarchy widget specifically since it routes without
+ * triggering (calling navigate without {trigger: true}).
+ */
+events.on('g:hierarchy.route', function (args) {
+    let curRoute = args.route;
+    if (!/^\//.test(curRoute)) {
+        curRoute = '/' + curRoute;
+    }
+    if (window.gtag) {
+        window.gtag('event', 'page_view', { girder_route: curRoute });
+    }
+});
+
+events.on('g:navigateTo', function (args) {
+    let curRoute = location.hash;
+    curRoute = curRoute.replace(/^#/, '');
+    if (window.gtag) {
+        window.gtag('event', 'page_view', { girder_route: curRoute });
+    }
+});

{girder-google-analytics-3.2.3.dev23 → girder-google-analytics-3.2.4.dev5}/girder_google_analytics/web_client/views/ConfigView.js

@@ -56,6 +56,8 @@ var ConfigView = View.extend({
             },
             error: null
         }).done(() => {
+            events.trigger('g:google_analytics.save');
+
             events.trigger('g:alert', {
                 icon: 'ok',
                 text: 'Settings saved.',

{girder-google-analytics-3.2.3.dev23 → girder-google-analytics-3.2.4.dev5}/girder_google_analytics.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: girder-google-analytics
-Version: 3.2.3.dev23
+Version: 3.2.4.dev5
 Summary: Allow the tracking of page views via Google Analytics.
 Home-page: http://girder.readthedocs.io/en/latest/plugins.html#google-analytics
 Author: Kitware, Inc.

{girder-google-analytics-3.2.3.dev23 → girder-google-analytics-3.2.4.dev5}/girder_google_analytics.egg-info/SOURCES.txt

@@ -13,7 +13,6 @@ girder_google_analytics.egg-info/top_level.txt
 girder_google_analytics/web_client/main.js
 girder_google_analytics/web_client/package.json
 girder_google_analytics/web_client/routes.js
-girder_google_analytics/web_client/lib/backbone.analytics.js
 girder_google_analytics/web_client/stylesheets/configView.styl
 girder_google_analytics/web_client/templates/configView.pug
 girder_google_analytics/web_client/views/ConfigView.js

girder-google-analytics-3.2.3.dev23/girder_google_analytics/web_client/lib/backbone.analytics.js

@@ -1,71 +0,0 @@
-// Copyright (C) 2013 by Kendall Buchanan
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-/* eslint-disable */
-(function(factory) {
-
-  'use strict';
-
-  if (typeof define === 'function' && define.amd) {
-    define(['backbone'], factory);
-  } else if (typeof exports === 'object') {
-    module.exports = factory(require('backbone'));
-  } else {
-    factory(window.Backbone);
-  }
-})(function(Backbone) {
-
-  'use strict';
-
-  var loadUrl = Backbone.History.prototype.loadUrl;
-
-  Backbone.History.prototype.loadUrl = function(fragmentOverride) {
-    var matched = loadUrl.apply(this, arguments),
-        gaFragment = this.fragment;
-
-    if (!this.options.silent) {
-      this.options.silent = true;
-      return matched;
-    }
-
-    if (!/^\//.test(gaFragment)) {
-      gaFragment = '/' + gaFragment;
-    }
-
-    // legacy version
-    if (typeof window._gaq !== "undefined") {
-      window._gaq.push(['_trackPageview', gaFragment]);
-    }
-
-    // Analytics.js
-    var ga;
-    if (window.GoogleAnalyticsObject && window.GoogleAnalyticsObject !== 'ga') {
-      ga = window.GoogleAnalyticsObject;
-    } else {
-      ga = window.ga;
-    }
-
-    if (typeof ga !== 'undefined') {
-      ga('set', 'page', gaFragment);
-      ga('send', 'pageview');
-    }
-    return matched;
-  };
-
-});

girder-google-analytics-3.2.3.dev23/girder_google_analytics/web_client/main.js

@@ -1,43 +0,0 @@
-import events from '@girder/core/events';
-import { restRequest } from '@girder/core/rest';
-
-import './lib/backbone.analytics';
-import './routes';
-
-events.on('g:appload.after', function () {
-    var dnt = navigator.doNotTrack || window.doNotTrack;
-    if (dnt !== '1' && dnt !== 'yes') {
-        /* eslint-disable */
-        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-        })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-        /* eslint-enable */
-
-        restRequest({
-            method: 'GET',
-            url: 'google_analytics/id'
-        }).done((resp) => {
-            if (resp.google_analytics_id) {
-                if (typeof ga !== 'undefined') {
-                    ga('create', resp.google_analytics_id, 'none');
-                }
-            }
-        });
-    }
-});
-
-/**
- * Add analytics for the hierarchy widget specifically since it routes without
- * triggering (calling navigate without {trigger: true}).
- */
-events.on('g:hierarchy.route', function (args) {
-    var curRoute = args.route;
-    if (!/^\//.test(curRoute)) {
-        curRoute = '/' + curRoute;
-    }
-    if (typeof ga !== 'undefined') {
-        /* global ga:false */
-        ga('send', 'pageview', curRoute);
-    }
-});