Merge pull request #19 from RakSrinaNa/develop

Develop

Author: Rakambda

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [2.2.3] - 2019-11-16
+
+- Update Amcharts to 4.7.10.
+- Do not count play time if less than 500ms.
+
 ## [2.2.2] - 2019-11-09
 
 - Try to avoid sending watched time twice when switching video.

Mozilla-libs.txt

@@ -1,7 +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"
+Amcharts 4.7.10 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

includes/js/background.js

@@ -181,6 +181,8 @@ function notify(title, text, force = false) {
  * @param {Object} event The event of the change.
  */
 function playerStateChange(event) {
+    const MINIMUM_WATCH_THRESHOLD = 500; //0.5s
+
     if (event[YTT_STATE_EVENT_STATE_KEY] === YTT_STATE_EVENT_STATE_KEY_PLAYING) {
         logDebug(`Started playing at ${event[YTT_STATE_EVENT_TIME_KEY]}s`);
         YTTSetBadge('P');
@@ -197,40 +199,6 @@ function playerStateChange(event) {
         activePlayers[event[YTT_STATE_EVENT_ID_KEY]] = null;
         logDebug(`Ended playing at ${event[YTT_STATE_EVENT_TIME_KEY]}s`);
 
-        let currentTime = new Date();
-        let watchedMilliseconds = currentTime - activePlayer['time'];
-
-        let startDayDate = new Date();
-        startDayDate.setHours(0, 0, 0, 0);
-
-        let msSinceThisMorning = currentTime - startDayDate;
-        let durationsInfo = {};
-
-        if (watchedMilliseconds > msSinceThisMorning) {
-            durationsInfo[YTTGetDayConfigKey()] = {
-                date: currentTime.getTime(),
-                duration: new YTTDuration(YTT_DATA_WATCHED, msSinceThisMorning)
-            };
-            watchedMilliseconds -= msSinceThisMorning;
-            let currentDay = startDayDate;
-            currentDay.setHours(23, 59, 59, 0);
-            while (watchedMilliseconds > 0) {
-                currentDay.setTime(currentDay.getTime() - YTT_MS_PER_DAY);
-                let dayKey = YTTGetDayConfigKey(currentDay);
-                let watchedThisDay = Math.min(YTT_MS_PER_DAY, watchedMilliseconds);
-                durationsInfo[dayKey] = {
-                    date: currentDay.getTime(),
-                    duration: new YTTDuration(YTT_DATA_WATCHED, watchedThisDay)
-                };
-                watchedMilliseconds -= watchedThisDay;
-            }
-        } else {
-            durationsInfo[YTTGetDayConfigKey()] = {
-                date: currentTime.getTime(),
-                duration: new YTTDuration(YTT_DATA_WATCHED, watchedMilliseconds)
-            };
-        }
-
         const videoID = activePlayer['vid'];
         let size = 0;
         for (const key in activePlayers) {
@@ -241,47 +209,84 @@ function playerStateChange(event) {
         if (size < 1) {
             YTTSetBadge('');
         }
-        YTTGetConfig([YTT_CONFIG_TOTAL_STATS_KEY, YTT_CONFIG_SHARE_ONLINE].concat(Object.keys(durationsInfo).filter(k => durationsInfo.hasOwnProperty(k)))).then(config => {
-            if (!config[YTT_CONFIG_TOTAL_STATS_KEY]) {
-                config[YTT_CONFIG_TOTAL_STATS_KEY] = new YTTDay();
+
+        let currentTime = new Date();
+        let watchedMilliseconds = currentTime - activePlayer['time'];
+
+        if (watchedMilliseconds > MINIMUM_WATCH_THRESHOLD) {
+            let startDayDate = new Date();
+            startDayDate.setHours(0, 0, 0, 0);
+
+            let msSinceThisMorning = currentTime - startDayDate;
+            let durationsInfo = {};
+
+            if (watchedMilliseconds > msSinceThisMorning) {
+                durationsInfo[YTTGetDayConfigKey()] = {
+                    date: currentTime.getTime(),
+                    duration: new YTTDuration(YTT_DATA_WATCHED, msSinceThisMorning)
+                };
+                watchedMilliseconds -= msSinceThisMorning;
+                let currentDay = startDayDate;
+                currentDay.setHours(23, 59, 59, 0);
+                while (watchedMilliseconds > 0) {
+                    currentDay.setTime(currentDay.getTime() - YTT_MS_PER_DAY);
+                    let dayKey = YTTGetDayConfigKey(currentDay);
+                    let watchedThisDay = Math.min(YTT_MS_PER_DAY, watchedMilliseconds);
+                    durationsInfo[dayKey] = {
+                        date: currentDay.getTime(),
+                        duration: new YTTDuration(YTT_DATA_WATCHED, watchedThisDay)
+                    };
+                    watchedMilliseconds -= watchedThisDay;
+                }
             } else {
-                config[YTT_CONFIG_TOTAL_STATS_KEY] = new YTTDay(config[YTT_CONFIG_TOTAL_STATS_KEY]);
+                durationsInfo[YTTGetDayConfigKey()] = {
+                    date: currentTime.getTime(),
+                    duration: new YTTDuration(YTT_DATA_WATCHED, watchedMilliseconds)
+                };
             }
 
-            Object.keys(durationsInfo).filter(k => durationsInfo.hasOwnProperty(k)).forEach(dayKey => {
-                const durationInfo = durationsInfo[dayKey];
-                const duration = durationInfo['duration'];
-                const timestamp = durationInfo['date'];
-
-                if (!config[dayKey]) {
-                    config[dayKey] = new YTTDay();
+            YTTGetConfig([YTT_CONFIG_TOTAL_STATS_KEY, YTT_CONFIG_SHARE_ONLINE].concat(Object.keys(durationsInfo).filter(k => durationsInfo.hasOwnProperty(k)))).then(config => {
+                if (!config[YTT_CONFIG_TOTAL_STATS_KEY]) {
+                    config[YTT_CONFIG_TOTAL_STATS_KEY] = new YTTDay();
                 } else {
-                    config[dayKey] = new YTTDay(config[dayKey]);
+                    config[YTT_CONFIG_TOTAL_STATS_KEY] = new YTTDay(config[YTT_CONFIG_TOTAL_STATS_KEY]);
                 }
 
-                config[YTT_CONFIG_TOTAL_STATS_KEY].getWatchedDuration().addDuration(duration);
-                config[dayKey].getWatchedDuration().addDuration(duration);
+                Object.keys(durationsInfo).filter(k => durationsInfo.hasOwnProperty(k)).forEach(dayKey => {
+                    const durationInfo = durationsInfo[dayKey];
+                    const duration = durationInfo['duration'];
+                    const timestamp = durationInfo['date'];
 
-                logDebug(`Added real time: ${duration.getAsString(true)} for day ${new Date(timestamp)}`);
-            });
+                    if (!config[dayKey]) {
+                        config[dayKey] = new YTTDay();
+                    } else {
+                        config[dayKey] = new YTTDay(config[dayKey]);
+                    }
 
-            YTTSetConfig(config).then(() => {
-                if (config[YTT_CONFIG_SHARE_ONLINE] === true) {
-                    sendRequestsToAPI(Object.keys(durationsInfo).filter(k => durationsInfo.hasOwnProperty(k)).map(dayKey => {
-                        const durationInfo = durationsInfo[dayKey];
-                        const duration = durationInfo['duration'];
-                        const timestamp = durationInfo['date'];
-
-                        return {
-                            date: timestamp,
-                            videoID: videoID,
-                            type: 'watched',
-                            duration: duration
-                        };
-                    }));
-                }
+                    config[YTT_CONFIG_TOTAL_STATS_KEY].getWatchedDuration().addDuration(duration);
+                    config[dayKey].getWatchedDuration().addDuration(duration);
+
+                    logDebug(`Added real time: ${duration.getAsString(true)} for day ${new Date(timestamp)}`);
+                });
+
+                YTTSetConfig(config).then(() => {
+                    if (config[YTT_CONFIG_SHARE_ONLINE] === true) {
+                        sendRequestsToAPI(Object.keys(durationsInfo).filter(k => durationsInfo.hasOwnProperty(k)).map(dayKey => {
+                            const durationInfo = durationsInfo[dayKey];
+                            const duration = durationInfo['duration'];
+                            const timestamp = durationInfo['date'];
+
+                            return {
+                                date: timestamp,
+                                videoID: videoID,
+                                type: 'watched',
+                                duration: duration
+                            };
+                        }));
+                    }
+                });
             });
-        });
+        }
     }
 }
 

includes/js/lib/amcharts/CHANGELOG.md

@@ -5,6 +5,44 @@ 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.10] - 2019-11-15
+
+### Added
+- Global method `am4core.system.softInvalidate(chart)` added. Call this method if you update data or config of a chart that is in hidden container, after revealing the container, so that labels and possibly other elements can correctly arrange themselves.
+
+### Fixed
+- JSON config `MapChart` was breaking on geodata parsing since last release (4.7.9).
+- Sometimes `MapChart` used to zoom to a wrong position when using `zoomToMapObject()` method (happened if pan inert animation was not finished at the moment of the function call).
+- `Container`'s "grid" layout was incorrectly positioning items if one of its children was disabled.
+- Creating a standalone series object (without assigning it to a chart) was resultin in a JS error.
+
+
+## [4.7.9] - 2019-11-14
+
+### Added
+- New `Sprite` property: `showTooltipOn`. Available options: `"hover"` (default), `"hit"`, and `"always"`.
+- `ignoreZeroValues` added to `PercentSeries` (default: `false`). If set to `true` it will not show slices with zero values.
+
+### Changed
+- `Sprite` property `alwaysShowTooltip` is now being deprecated in favor of `showTooltipOn = "always"`.
+- In `WordCloud` words connected with a dash without spaces will not be treated as a single word, e.g. "76-ers" is now a single word rather than two separate words "76" and "ers".
+- JSON config based charts will now fail with a critical error if there's incorrect `type` specified for one of the objects.
+
+### Fixed
+- Initial chart responsive rules were sometimes not being applied.
+- When `MapChart` was zoomed/panned, "always-on" tooltip were remaining in the same place.
+- HTML labels with `maxWidth` and `wrap` set were not being sized correctly.
+- Sides of `Column3D` were not being colored properly when `fill` was being set via `propertyFields` and string-based hex color codes were used in data.
+- After click on chart with `XYCursor` that `behavior = "select*"` its `xRange` and `yRange` was not being reset and could show ranges from previous selection.
+- `XYCursor` will now respect order of series when showing their tooltips if they share the same value.
+- Tooltip position of rotated and/or scaled sprites was incorrect.
+- Changing series of `XYChartScrollbar` was not working properly (old series could remain or new series were not appearing).
+- `PictorialSeries`, and `PyramidSeries` were not working properly with slices with `<= 0` values.
+- When removing data from a chart using `addData(data, removeCount)`, chart was rmeoving data items from series which had data set explicitly.
+- Bullets on a `RadarChart` could be displayed in wrong positions when zooming/hiding series.
+- When minimizing series they could animate to incorrect minimum values and adjust min/max values.
+
+
 ## [4.7.8] - 2019-11-05
 
 ### Added