From 158c398df487b8d80160ce871ab174a98a2d9889 Mon Sep 17 00:00:00 2001 From: rhymes Date: Fri, 26 Apr 2019 18:42:49 +0200 Subject: [PATCH] Remove unused timeString statements (#2568) [ci skip] --- .../initializers/initNotifications.js | 4 +- .../initializers/initializeBodyData.js | 64 +++++++++---------- .../initializeCommentsPage.js.erb | 2 +- app/views/pages/badge.html.erb | 2 +- 4 files changed, 35 insertions(+), 37 deletions(-) diff --git a/app/assets/javascripts/initializers/initNotifications.js b/app/assets/javascripts/initializers/initNotifications.js index 05e52f17f..61c9f2750 100644 --- a/app/assets/javascripts/initializers/initNotifications.js +++ b/app/assets/javascripts/initializers/initNotifications.js @@ -62,8 +62,8 @@ function fetchNotificationsCount() { } } }; - var timeString = (Date.now()).toString(); - xmlhttp.open('Get', '/notifications/counts', true); + + xmlhttp.open('GET', '/notifications/counts', true); xmlhttp.send(); } } diff --git a/app/assets/javascripts/initializers/initializeBodyData.js b/app/assets/javascripts/initializers/initializeBodyData.js index db835745e..c93591687 100644 --- a/app/assets/javascripts/initializers/initializeBodyData.js +++ b/app/assets/javascripts/initializers/initializeBodyData.js @@ -1,4 +1,3 @@ - function initializeBodyData() { fetchBaseData(); } @@ -6,48 +5,47 @@ function initializeBodyData() { function fetchBaseData() { var xmlhttp; if (window.XMLHttpRequest) { - xmlhttp = new XMLHttpRequest(); + xmlhttp = new XMLHttpRequest(); } else { - xmlhttp = new ActiveXObject("Microsoft.XMLHTTP"); + xmlhttp = new ActiveXObject('Microsoft.XMLHTTP'); } xmlhttp.onreadystatechange = function() { - if (xmlhttp.readyState == XMLHttpRequest.DONE ) { - var json = JSON.parse(xmlhttp.responseText); - if (json.token) { - removeExistingCSRF(); - } - var meta = document.createElement('meta'); - var metaTag = document.querySelector("meta[name='csrf-token']"); - meta.name = "csrf-param"; - meta.content = json.param; - document.getElementsByTagName('head')[0].appendChild(meta); - var meta = document.createElement('meta'); - meta.name = "csrf-token"; - meta.content = json.token; - document.getElementsByTagName('head')[0].appendChild(meta); - document.getElementsByTagName('body')[0].dataset.loaded = "true"; - if (checkUserLoggedIn()) { - document.getElementsByTagName('body')[0].dataset.user = json.user; - browserStoreCache("set",json.user) - setTimeout(function(){ - if (typeof ga === "function") { - ga('set', 'userId', JSON.parse(json.user).id); - } - },400) - } + if (xmlhttp.readyState == XMLHttpRequest.DONE) { + var json = JSON.parse(xmlhttp.responseText); + if (json.token) { + removeExistingCSRF(); } - }; - var timeString = (Date.now()).toString(); - xmlhttp.open("GET", "/async_info/base_data", true); + var meta = document.createElement('meta'); + var metaTag = document.querySelector("meta[name='csrf-token']"); + meta.name = 'csrf-param'; + meta.content = json.param; + document.getElementsByTagName('head')[0].appendChild(meta); + var meta = document.createElement('meta'); + meta.name = 'csrf-token'; + meta.content = json.token; + document.getElementsByTagName('head')[0].appendChild(meta); + document.getElementsByTagName('body')[0].dataset.loaded = 'true'; + if (checkUserLoggedIn()) { + document.getElementsByTagName('body')[0].dataset.user = json.user; + browserStoreCache('set', json.user); + setTimeout(function() { + if (typeof ga === 'function') { + ga('set', 'userId', JSON.parse(json.user).id); + } + }, 400); + } + } + }; + + xmlhttp.open('GET', '/async_info/base_data', true); xmlhttp.send(); } - -function removeExistingCSRF(){ +function removeExistingCSRF() { var csrfTokenMeta = document.querySelector("meta[name='csrf-token']"); var csrfParamMeta = document.querySelector("meta[name='csrf-param']"); if (csrfTokenMeta && csrfParamMeta) { csrfTokenMeta.parentNode.removeChild(csrfTokenMeta); csrfParamMeta.parentNode.removeChild(csrfParamMeta); } -} \ No newline at end of file +} diff --git a/app/assets/javascripts/initializers/initializeCommentsPage.js.erb b/app/assets/javascripts/initializers/initializeCommentsPage.js.erb index 7ff5403e2..98864a747 100644 --- a/app/assets/javascripts/initializers/initializeCommentsPage.js.erb +++ b/app/assets/javascripts/initializers/initializeCommentsPage.js.erb @@ -54,7 +54,7 @@ function initializeCommentsPage() { } } }; - var timeString = (Date.now()).toString(); + ajaxReq.open("GET", "/reactions?commentable_id=" + commentableIdList[i] + "&commentable_type=" + commentableType, true); ajaxReq.send(); })(i); diff --git a/app/views/pages/badge.html.erb b/app/views/pages/badge.html.erb index 20a745991..abb8ee859 100644 --- a/app/views/pages/badge.html.erb +++ b/app/views/pages/badge.html.erb @@ -88,7 +88,7 @@ document.getElementsByTagName('body')[0].dataset.loaded = "true"; } }; - var timeString = (Date.now()).toString(); + xmlhttp.open("GET", "/async_info/base_data", true); xmlhttp.send(); }