Update amcharts & improve player detection

Author: Rakambda

CHANGELOG.md

@@ -1,10 +1,15 @@
 # Changelog
 
+## [2.2.1] - 2019-11-08
+
+- Update Amcharts to 4.7.8.
+- Improve player detection.
+
 ## [2.2.0] - 2019-11-07
 
 - Update Amcharts to 4.7.7.
 - When watching a video across several days the time is split between these days instead of all being on the last day  (#15).
-- Added a button in the settings to export the data directly on Dropbox.
+- Added a button in the settings to export the data directly on Dropbox (#10).
 
 ## [2.1.3] - 2019-10-08
 

Mozilla-libs.txt

@@ -0,0 +1,7 @@
+Library used:
+
+jQuery 3.4.1 from https://jquery.com/download/ "Download the compressed, production jQuery 3.4.1"
+Amcharts 4.7.7 from https://www.amcharts.com/download/ "Download a standalone JavaScript version"
+Bootstrap 4.3.1 from https://getbootstrap.com/docs/4.3/getting-started/download/#compiled-css-and-js
+Popper.js 1.15.0 from https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.15.0/umd/popper.js
+DropboxSDK 4.0.30 from https://www.npmjs.com/package/dropbox/v/4.0.30

README.md

@@ -37,6 +37,8 @@ Bootstrap - [https://getbootstrap.com/](https://getbootstrap.com/)
 
 JQuery - [https://github.com/jquery/jquery](https://github.com/jquery/jquery)
 
+Dropbox SDK - [https://www.dropbox.com/developers/documentation/javascript](https://www.dropbox.com/developers/documentation/javascript)
+
 ## Other
 Compare versions function from [em92's gist](https://gist.github.com/em92/d58944f21c68b69433cefb6c49e0defd).
 

includes/js/background.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const YTT_MS_PER_DAY = 86400 * 1000;
 const activePlayers = {};
 
@@ -39,7 +37,7 @@ function setupExtension() {
 
             newConfig[YTT_CONFIG_TOTAL_STATS_KEY] = totalStats;
 
-            YTTRemoveConfig([YTT_CONFIG_TOTAL_TIME_KEY, YTT_CONFIG_REAL_TIME_KEY], null);
+            YTTRemoveConfig([YTT_CONFIG_TOTAL_TIME_KEY, YTT_CONFIG_REAL_TIME_KEY]);
         }
 
         YTTRemoveConfig(['YTTHanddrawn', 'YTTTheme']);
@@ -93,14 +91,14 @@ function sendRequestsToAPI(requests) {
             },
             method: 'POST',
             async: true,
-            error: function () {
+            error: () => {
                 notify(`Failed to send ${type} time to server`, `VideoID: ${videoId}\nDuration: ${duration.getAsString(true)}\nDate: ${timeStr}`);
                 console.error('Failed to send request to API', uuid, videoId, duration, date, type);
                 if (onFail) {
                     onFail();
                 }
             },
-            success: function () {
+            success: () => {
                 notify(`Sent ${type} time to server`, `VideoID: ${videoId}\nDuration: ${duration.getAsString(true)}\nDate: ${timeStr}`);
                 console.debug('Sent to API', uuid, videoId, duration, date, type);
                 if (onSuccess) {
@@ -121,7 +119,7 @@ function sendRequestsToAPI(requests) {
             if (trackData && trackData['videoID'] && trackData['duration']) {
                 sendRequest(uuid, trackData['videoID'], new YTTDuration(trackData['duration']), trackData['date'], trackData['type'], function () {
                     sendAllRequests(uuid, requests);
-                }, function () {
+                }, () => {
                     YTTConfigAddInArray(YTT_CONFIG_FAILED_SHARE, [trackData]);
                     sendAllRequests(uuid, requests);
                 });

includes/js/chart.js

@@ -7,9 +7,7 @@ $(function () {
         YTTGetConfig(null).then(config => {
             const WEIRD_DATA_THRESHOLD = config[YTT_CONFIG_WEIRD_DATA_THRESHOLD];
             const weirdData = [];
-            const data = Object.keys(config).filter(k => k.startsWith('day')).map(k => k.replace('day', '')).sort(function (a, b) {
-                return YTTCompareConfigDate(b, a);
-            }).map(function (day) {
+            const data = Object.keys(config).filter(k => k.startsWith('day')).map(k => k.replace('day', '')).sort((a, b) => YTTCompareConfigDate(b, a)).map(day => {
                 const conf = new YTTDay(config[`day${day}`]);
                 const dayData = {
                     day: day,
@@ -206,7 +204,7 @@ $(function () {
                 updatePeriodData(periodData);
             }
 
-            chart.events.on('ready', function () {
+            chart.events.on('ready', () => {
                 let oneWeekAgo = new Date();
                 oneWeekAgo.setHours(0);
                 oneWeekAgo.setMinutes(0);

includes/js/content.js

@@ -43,7 +43,7 @@ function injectCode() {
     body.append(YTTGetInjectDiv(YTT_DOM_PLAYER_TIME_1, '0'));
     body.append(YTTGetInjectDiv(YTT_DOM_PLAYER_TIME_2, '0'));
 
-    $(window).on('beforeunload', function () {
+    $(window).on('beforeunload', () => {
         const event = {};
         event[YTT_STATE_EVENT_STATE_KEY] = YTT_STATE_EVENT_STATE_KEY_WATCHED;
         event[YTT_STATE_EVENT_TIME_KEY] = $(`#${YTT_DOM_PLAYER_TIME_2}`).text();
@@ -77,7 +77,7 @@ function injectCode() {
      * @param {function} callback
      */
     function observeElement(id, callback) {
-        const observer = new MutationObserver(function (mutations) {
+        const observer = new MutationObserver(mutations => {
             mutations.forEach(callback);
         });
         observer.observe(document.getElementById(id), {
@@ -91,7 +91,7 @@ function injectCode() {
     YTTLog('Injected player dom');
 }
 
-$(function () {
+$(() => {
     if (window && window.location && window.location.href && window.location.href.startsWith('https://yttracker.mrcraftcod.fr/')) {
         $('.extensionsAd').hide();
     } else {

includes/js/editHighValues.js

@@ -1,5 +1,5 @@
 $(function () {
-    $('#backButton').on('click', function () {
+    $('#backButton').on('click', () => {
         document.location.href = 'chart.html';
     });
 
@@ -21,7 +21,7 @@ $(function () {
             $('#days-edit-input').val(obj.conf[kind].days);
         }
 
-        $('#edit-form').on('submit', function (e) {
+        $('#edit-form').on('submit', e => {
             e.preventDefault();
             const newDuration = new YTTDuration(editingKind, 0, parseInt($('#seconds-edit-input').val() || '0', 10), parseInt($('#minutes-edit-input').val() || '0', 10), parseInt($('#hours-edit-input').val() || '0', 10), parseInt($('#days-edit-input').val() || '0', 10));
             console.log('New duration parsed', newDuration, editingKind, editingVar.dayStr);
@@ -44,9 +44,7 @@ $(function () {
             });
         });
 
-        Object.keys(config).filter(k => k.startsWith('day')).map(k => k.replace('day', '')).sort(function (a, b) {
-            return YTTCompareConfigDate(b, a);
-        }).map(day => {
+        Object.keys(config).filter(k => k.startsWith('day')).map(k => k.replace('day', '')).sort((a, b) => YTTCompareConfigDate(b, a)).map(day => {
             return {
                 day: YTTGetDateFromDay(day),
                 dayStr: day,
@@ -64,7 +62,7 @@ $(function () {
             if (obj.conf.getOpenedDuration().getAsMilliseconds() > WEIRD_DATA_THRESHOLD) {
                 let buttonEditOpened = $(`<button type="button" class="btn btn-primary btn-block edit-conf-value" data-toggle="modal" data-target="#modal-time">`)
                     .text(`Edit opened time of the ${YTTGetDateString(obj.day.getTime())} (${obj.conf.getOpenedDuration().getAsString()})`);
-                buttonEditOpened.on('click', function (e) {
+                buttonEditOpened.on('click', e => {
                     startEdit($(this), obj, YTT_DATA_OPENED);
                 });
                 $('<div class="row mt-1">').append(buttonEditOpened).appendTo(editDiv);

includes/js/hooker.js

@@ -2,33 +2,35 @@
  * Setup hook onto the YouTube player.
  */
 function YTTHookProcess() {
-	const RETRY_DELAY = 250;
-	let hooked = false;
-	try {
-		let YTTPlayerTemp;
-		YTTPlayerTemp = document.getElementById('movie_player');
-		if (YTTPlayerTemp && hookYTTPlayer)
-			hooked = hookYTTPlayer(YTTPlayerTemp);
-	}
-	catch (ignored) {
-	}
-	if (hooked)
-		YTTUpdateDOM();
-	else
-		setTimeout(YTTHookProcess, RETRY_DELAY);
+    const RETRY_DELAY = 250;
+    let hooked = false;
+    try {
+        console.debug('Trying to hook to player');
+        let YTTPlayerTemp;
+        YTTPlayerTemp = document.getElementById('movie_player');
+        if (YTTPlayerTemp && hookYTTPlayer) {
+            hooked = hookYTTPlayer(YTTPlayerTemp);
+        }
+    } catch (ignored) {
+    }
+    if (hooked) {
+        YTTUpdateDOM();
+    } else {
+        setTimeout(YTTHookProcess, RETRY_DELAY);
+    }
 }
 
 /**
  * Called when the hook is successfull and start a scheduled task to update current player time continuously.
  */
 function YTTUpdateDOM() {
-	setInterval(function () {
-		const YTTTempPlayer = YTTGetPlayer();
-		if (YTTTempPlayer && YTTTempPlayer.getCurrentTime && YTTTempPlayer.getCurrentTime()) {
-			document.getElementById(YTT_DOM_PLAYER_TIME_2).innerHTML = document.getElementById(YTT_DOM_PLAYER_TIME_1).innerHTML;
-			document.getElementById(YTT_DOM_PLAYER_TIME_1).innerHTML = YTTTempPlayer.getCurrentTime();
-		}
-	}, 75);
+    setInterval(() => {
+        const YTTTempPlayer = YTTGetPlayer();
+        if (YTTTempPlayer && YTTTempPlayer.getCurrentTime && YTTTempPlayer.getCurrentTime()) {
+            document.getElementById(YTT_DOM_PLAYER_TIME_2).innerHTML = document.getElementById(YTT_DOM_PLAYER_TIME_1).innerHTML;
+            document.getElementById(YTT_DOM_PLAYER_TIME_1).innerHTML = YTTTempPlayer.getCurrentTime();
+        }
+    }, 75);
 }
 
 YTTHookProcess();

includes/js/hookerUtils.js

@@ -1,11 +1,11 @@
-let YTTHooked = false;
 let YTTPlayer;
 
 /**
  * Update the player state in the DOM.
  * @param {number} playerState The event of the player (player status).
  */
 function changeDOMTime(playerState) {
+    console.log("ps", playerState);
     if (playerState === 1) {
         document.getElementById(YTT_DOM_PLAYER_STATE).innerHTML = YTT_STATE_EVENT_STATE_KEY_PLAYING + YTT_DOM_SPLITTER + YTTGetPlayer().getCurrentTime();
     } else if (playerState === 2 || playerState === 0 || playerState === -5 || playerState === 3) {
@@ -26,6 +26,7 @@ function changeDOMInfos() {
  * Called when the video changes.
  */
 function changeVideo() {
+    console.log("v");
     if (YTTGetPlayer().getVideoData && YTTGetPlayer().getVideoData()['video_id'] !== (document.getElementById(YTT_DOM_PLAYER_INFOS).innerHTML.split(YTT_DOM_SPLITTER)[0] || '') && YTTGetPlayer().getCurrentTime && YTTGetPlayer().getDuration) {
         changeDOMTime(-5);
         changeDOMInfos();
@@ -46,11 +47,10 @@ function YTTGetPlayer() {
  * @returns {boolean} True if successfull, false otherwise.
  */
 function hookYTTPlayer(player) {
-    if (YTTHooked || typeof player !== 'object' || !(player.getCurrentTime || player.getVideoData || player.getDuration || player.getPlayerState)) {
+    if (typeof player !== 'object' || !(player.getCurrentTime || player.getVideoData || player.getDuration || player.getPlayerState)) {
         return false;
     }
     console.log('Player hooked');
-    YTTHooked = true;
     YTTPlayer = player;
     document.getElementById(YTT_DOM_PLAYER_TIME_1).innerHTML = YTTPlayer.getCurrentTime();
     document.getElementById(YTT_DOM_PLAYER_TIME_2).innerHTML = YTTPlayer.getCurrentTime();

includes/js/lib/amcharts/CHANGELOG.md

@@ -5,6 +5,23 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 Please note, that this project, while following numbering syntax, it DOES NOT
 adhere to [Semantic Versioning](http://semver.org/spec/v2.0.0.html) rules.
 
+## [4.7.8] - 2019-11-05
+
+### Added
+- `itemIndex` added to `AxisDataItem`. Shows current index of data item on the axis.
+
+### Changed
+- `extremeschanged` is now dispatched by `DateAxis` when the `min`/`max` are animating.
+
+### Fixed
+- Setting `maskBullets` on an `XYChart` will toggle on or off bullet masking dynamically.
+- In some particular cases some Sankey nodes were drawn out of bounds.
+- `behaviorcanceled` event of `ChartCursor` was not being fired.
+- Regression plugin was failing when added to Series object that was not yet attached to a Chart.
+- JSON config was failing where Label's `text` or `html` properties were being set to percent value.
+- Toggling of `DateAxis.skipEmptyPeriods` was not working after the chart was already inited.
+
+
 ## [4.7.7] - 2019-11-02
 
 ### Added
@@ -1226,7 +1243,7 @@ adhere to [Semantic Versioning](http://semver.org/spec/v2.0.0.html) rules.
 ## [4.0.16] - 2019-01-05
 
 ### Added
-- New locales: Norwegian Bokmål (np_NO), Danish (da_DK).
+- New locales: Norwegian Bokm? (np_NO), Danish (da_DK).
 
 ### Changed
 - Renamed Swedish locale to `sv_SE`.