Merge branch 'release/1.1.63'

Author: beshur

README.md

@@ -11,45 +11,46 @@ popular streaming services.
 
 
 At the moment we fully support (stop and play)
-* Spotify
-* PromoDJ
 * Bandcamp
-* Coub.com
 * Classicalradio.com
-* vkontakte
-* Google Music
-* vimeo
-* YouTube
+* Coub.com
+* DailyMotion.com
+* Deezer.com
 * Facebook
+* Google Music
 * Kickstarter
-* hearthis.at
-* Rutube
-* TED.com
-* Muzebra
-* Pleer.net (pleer.com)
 * Last.fm (web-version)
-* Soundcloud
 * Mixcloud
-* Seasonvar
-* Yandex.Music
-* TuneIn.com
-* megogo.net
+* Muzebra
+* Netflix
+* Pleer.net (pleer.com)
 * Prometheus.com.ua
+* PromoDJ
 * Radiotunes.com
 * Rockradio.com
-* DailyMotion.com
+* Rutube
+* Seasonvar
+* Soundcloud
+* Spotify
+* TED.com
+* TuneIn.com
+* Yandex.Music
+* YouTube
+* armyfm.com.ua
 * coursera.org
-* slipstreamradio.com
-* jazzradio.com
-* Deezer.com
-* Netflix
 * di.fm
+* hearthis.at
+* jazzradio.com
+* livestream.com
+* megogo.net
 * mubert.com
+* musicforprogramming.net
+* radiolist.com.ua
+* slipstreamradio.com
 * udemy.com
-* livestream.com
-* armyfm.com.ua
+* vimeo
+* vkontakte
 * zenradio.com
-* musicforprogramming.net
 
 ## How it works
 It just works!

manifest.json

@@ -3,7 +3,7 @@
     "name": "StoPlay",
     "short_name": "StoPlay",
     "homepage_url": "http://stoplay.github.io/",
-    "version": "1.1.62",
+    "version": "1.1.63",
     "author": [
         {
             "name": "Alex Karpov",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "stoplayExt-build",
-  "version": "1.1.62",
+  "version": "1.1.63",
   "author": "Alex Buznik",
   "dependencies": {},
   "repository": {

src/background/ProvidersList.js

@@ -1,52 +1,53 @@
 export const ProvidersList = [
-    "vk.com",
-    "new.vk.com",
-    "music.youtube.com",
-    "gaming.youtube.com",
-    "youtube.com",
-    "vimeo.com",
-    "muzebra.com",
-    "pleer.net",
-    "last.fm",
-    "rutube.ru",
-    "ted.com",
-    "mixcloud.com",
-    "soundcloud.com",
-    "seasonvar.ru",
-    "play.google.com",
-    "music.yandex.ua",
-    "music.yandex.ru",
-    "v5player.slipstreamradio.com",
-    "jazzradio.com",
-    "rockradio.com",
-    "radiotunes.com",
-    "classicalradio.com",
-    "tunein.com",
-    "megogo.net",
-    "spotify.com",
-    "play.spotify.com",
-    "open.spotify.com",
-    "bandcamp.com",
-    "promodj.com",
-    "facebook.com",
-    "kickstarter.com",
-    "hearthis.at",
-    "player.vimeo.com",
-    "courses.prometheus.org.ua",
-    "dailymotion.com",
-    "coursera.org",
-    "deezer.com",
-    "netflix.com",
-    "egghead.io",
-    "audible.ca",
-    "audible.com",
-    "audible.com.au",
-    "di.fm",
-    "play.mubert.com",
-    "coub.com",
-    "livestream.com",
-    "udemy.com",
-    "armyfm.com.ua",
-    "zenradio.com",
-    "musicforprogramming.net",
+    'armyfm.com.ua',
+    'audible.ca',
+    'audible.com',
+    'audible.com.au',
+    'bandcamp.com',
+    'classicalradio.com',
+    'coub.com',
+    'coursera.org',
+    'courses.prometheus.org.ua',
+    'dailymotion.com',
+    'deezer.com',
+    'di.fm',
+    'egghead.io',
+    'facebook.com',
+    'gaming.youtube.com',
+    'hearthis.at',
+    'jazzradio.com',
+    'kickstarter.com',
+    'last.fm',
+    'livestream.com',
+    'megogo.net',
+    'mixcloud.com',
+    'music.yandex.ru',
+    'music.yandex.ua',
+    'music.youtube.com',
+    'musicforprogramming.net',
+    'muzebra.com',
+    'netflix.com',
+    'new.vk.com',
+    'open.spotify.com',
+    'play.google.com',
+    'play.mubert.com',
+    'play.spotify.com',
+    'player.vimeo.com',
+    'pleer.net',
+    'promodj.com',
+    'radiolist.com.ua',
+    'radiotunes.com',
+    'rockradio.com',
+    'rutube.ru',
+    'seasonvar.ru',
+    'soundcloud.com',
+    'spotify.com',
+    'ted.com',
+    'tunein.com',
+    'udemy.com',
+    'v5player.slipstreamradio.com',
+    'vimeo.com',
+    'vk.com',
+    'youtube.com',
+    'zenradio.com'
 ];

src/background/index.js

@@ -37,8 +37,8 @@ function restoreOptions(callback) {
 		providers: providersDefault
 	}, function(items) {
 		var providersCurrent = mergeProviders(items.providers);
-		if (callback) {
-			callback.call(null, providersCurrent);
+		if (typeof callback === 'function') {
+			callback(providersCurrent);
 		}
 	});
 }
@@ -75,6 +75,15 @@ function mergeProviders(oldItems) {
 	return providersFull;
 }
 
+function resetProviders(callback) {
+	restoreOptions(function(providersMerged) {
+		saveToOptions({providers: providersMerged});
+		if (typeof callback === 'function') {
+			callback(providersMerged);
+		}
+	})
+}
+
 DataStorage.set('status', 'silent');
 
 if (!DataStorage.get('version')) {
@@ -83,9 +92,7 @@ if (!DataStorage.get('version')) {
 } else if (DataStorage.get('version') != version) {
 	// extension updated
 	saveVersion();
-	restoreOptions(function(providersMerged) {
-		saveToOptions({providers: providersMerged});
-	});
+	resetProviders();
 }
 
 chrome.storage.onChanged.addListener(function(changes, namespace) {
@@ -128,9 +135,10 @@ chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
 	var lastPlayingTabId = parseInt(DataStorage.get('lastPlayingTabId')),
 		lastPlayingFrameId = parseInt(DataStorage.get('lastPlayingFrameId')) || 0,
 		lastPausedTabId = parseInt(DataStorage.get('lastPausedTabId')),
-		status = DataStorage.get('status');
+		status = DataStorage.get('status'),
+		isOptionsPage = sender.url.indexOf(chrome.runtime.id) > -1
 
-	if(request.action && sender.tab) {
+	if(request.action && (sender.tab || isOptionsPage)) {
 		switch(request.action) {
 			case 'updateTitle':
 				if (request.title) {
@@ -163,6 +171,14 @@ chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
 				chrome.browserAction.setTitle({title: "StoPlay" });
 				break;
 
+			case 'resetProviders':
+				resetProviders((providers) => {
+					sendResponse({
+						providers
+					})
+				});
+				break;
+
 			case 'toggle':
 				if(lastPlayingTabId) {
 					var action = (status == 'playing') ? 'pause' : 'play';