From 5c8416dfe16275828f63dbf31c7ac5dc05911627 Mon Sep 17 00:00:00 2001 From: Thomas Steur Date: Tue, 1 Dec 2020 11:30:15 +1300 Subject: [PATCH] remove real time map refs #5414 --- app/controllers/realtime_map.js | 136 ------------------------------ app/controllers/report_chooser.js | 9 -- app/styles/realtime_map.tss | 42 --------- app/views/realtime_map.xml | 37 -------- tiapp.xml | 4 +- 5 files changed, 2 insertions(+), 226 deletions(-) delete mode 100644 app/controllers/realtime_map.js delete mode 100644 app/styles/realtime_map.tss delete mode 100644 app/views/realtime_map.xml diff --git a/app/controllers/realtime_map.js b/app/controllers/realtime_map.js deleted file mode 100644 index d41d50f7..00000000 --- a/app/controllers/realtime_map.js +++ /dev/null @@ -1,136 +0,0 @@ -/** - * Matomo - Open source web analytics - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later - */ - -function L(key) -{ - return require('L')(key); -} - -var urlToLoad = null; - -function registerEvents() -{ - var session = require('session'); - session.on('websiteChanged', openRealTimeMapInWebview); - session.on('segmentChanged', openRealTimeMapInWebview); -} - -function unregisterEvents() -{ - var session = require('session'); - session.off('websiteChanged', openRealTimeMapInWebview); - session.off('segmentChanged', openRealTimeMapInWebview); -} - -function trackWindowRequest() -{ - require('Piwik/Tracker').trackWindow('Real-time Map', 'real-time-map'); -} - -$.emptyData = new (require('ui/emptydata')); - -function refresh() -{ - if (!urlToLoad) { - return; - } - - $.loadingIndicator.show(); - $.emptyData && $.emptyData.cleanupIfNeeded(); - $.browser.hide(); - - $.browser.url = urlToLoad; -} - -function onErrored(event) -{ - if (event && event.error) { - var message = event.error + ' (code ' + event.code + ')'; - $.emptyData.show($.index, refresh, L('Mobile_NetworkError'), message); - $.loadingIndicator.hide(); - $.browser.hide(); - } else { - onLoaded(); - } -} - -function onLoaded() -{ - $.browser.show(); - $.loadingIndicator.hide(); - $.emptyData && $.emptyData.cleanupIfNeeded(); -} - -function onOpen() -{ - trackWindowRequest(); -} - -function onClose() -{ - unregisterEvents(); - $.emptyData && $.emptyData.cleanupIfNeeded(); - if (OS_ANDROID && $.browser.release) { - $.browser.release(); - } - $.destroy(); - $.off(); -} - -function openRealTimeMapInWebview() -{ - var accountModel = require('session').getAccount(); - var siteModel = require('session').getWebsite(); - var segmentModel = require('session').getSegment(); - - if (!accountModel || !siteModel) { - return; - } - - var url = accountModel.getBasePath(); - url += "index.php?module=Widgetize&action=iframe&widget=1&moduleToWidgetize=UserCountryMap&actionToWidgetize=realtimeMap&idSite="; - url += siteModel.id; - url += "&period=month&date=today&disableLink=1&widget=1&token_auth="; - url += accountModel.getAuthToken(); - - if (segmentModel) { - url += '&segmentOverride=1&segment=' + segmentModel.getDefinition(); - } - - urlToLoad = url; - refresh(); -} - -exports.open = function () -{ - require('layout').open($.index); - - openRealTimeMapInWebview(); - - registerEvents(); -} - -function toggleReportConfiguratorVisibility (event) -{ - require('report/configurator').toggleVisibility(); - - require('Piwik/Tracker').trackEvent({name: 'Toggle Report Configurator', category: 'Real time map'}); -} - -function toggleReportChooserVisibility(event) -{ - require('report/chooser').toggleVisibility(); - - require('Piwik/Tracker').trackEvent({name: 'Toggle Report Chooser', category: 'Real time map'}); -} - -function close() -{ - require('layout').close($.index); -} - -exports.close = close; \ No newline at end of file diff --git a/app/controllers/report_chooser.js b/app/controllers/report_chooser.js index ee82d164..efec8a37 100644 --- a/app/controllers/report_chooser.js +++ b/app/controllers/report_chooser.js @@ -25,7 +25,6 @@ function updateAvailableReportsList() var latestSection = null; rows.push(Alloy.createController('report_chooser_section', {title: L('General_Live')}).getView()); - rows.push(Alloy.createController('report_chooser_row', {title: L('UserCountryMap_RealTimeMap'), cid: 'visitormap'}).getView()); rows.push(Alloy.createController('report_chooser_row', {title: L('Live_VisitorsInRealTime'), cid: 'live'}).getView()); rows.push(Alloy.createController('report_chooser_row', {title: L('Live_VisitorLog'), cid: 'visitorlog'}).getView()); rows.push(Alloy.createController('report_chooser_section', {title: L('General_Reports')}).getView()); @@ -154,8 +153,6 @@ function doSelectReport(event) openLiveVisitors(); } else if ('visitorlog' == cid) { openVisitorLog(); - } else if ('visitormap' == cid) { - openVisitorMap(); } else if ('settings' == cid) { openSettings(); } else if ('help' == cid) { @@ -237,12 +234,6 @@ function openVisitorLog() log.open(); } -function openVisitorMap() -{ - var realtimemap = Alloy.createController('realtime_map'); - realtimemap.open(); -} - function openGiveFeedback() { var feedback = Alloy.createController('give_feedback'); diff --git a/app/styles/realtime_map.tss b/app/styles/realtime_map.tss deleted file mode 100644 index 35353457..00000000 --- a/app/styles/realtime_map.tss +++ /dev/null @@ -1,42 +0,0 @@ -"#index": { - title: L('UserCountryMap_RealTimeMap'), - backButtonTitleImage: 'blank.png' -} - -"#headerBar": { - title: L('UserCountryMap_RealTimeMap'), -} - -"#headerBar[formFactor=handheld]": { - actionItem1: {icon: '/images/ic_more_vert_white_24dp.png'}, - hasNavigation: true, -} - -"#browser": { - disableBounce: true, - scalesPageToFit: false, - enableZoomControls: false -} - -"#browser[platform=android]": { - top: '56dp', - borderRadius: '1dp' -} - -"#loadingIndicator": { - left: 0, - top: 0, - height: Ti.UI.FILL, - width: Ti.UI.FILL, - visible: true, - backgroundColor: 'white', - zIndex: 5 -}, - -"#loadingIndicator[platform=android]": { - top: '56dp' -} - -"#loadingLabel": { - text: L('General_LoadingData') -}, \ No newline at end of file diff --git a/app/views/realtime_map.xml b/app/views/realtime_map.xml deleted file mode 100644 index 5bed8f9d..00000000 --- a/app/views/realtime_map.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - -