diff --git a/assets/www/android/platform.js b/assets/www/android/platform.js index 0873927f..74cf4598 100644 --- a/assets/www/android/platform.js +++ b/assets/www/android/platform.js @@ -141,6 +141,14 @@ function sharePage() { ); } +function showAudio() { + if (audioPlayer.isAvailable()) { + audioPlayer.createMenuArray(); + }else { + chrome.showNotification("audio unavailable for this page"); + } +} + chrome.showNotification = function(text) { // Using PhoneGap-Toast plugin for Android's lightweight "Toast" style notifications. // https://github.com/m00sey/PhoneGap-Toast @@ -160,7 +168,7 @@ function updateMenuState() { 'go-forward': function() { chrome.goForward(); }, 'select-text': function() { selectText(); }, 'view-settings': function() { appSettings.showSettings(); }, - 'listen-sound': function() { audioPlayer.createMenuArray(); }, + 'listen-sound': function() { showAudio(); }, 'word-of-the-day': function() { chrome.loadWordoftheDay(); }, }; $('#appMenu command').each(function() { diff --git a/assets/www/index.html b/assets/www/index.html index b35356ce..8c0314b2 100644 --- a/assets/www/index.html +++ b/assets/www/index.html @@ -267,7 +267,7 @@ - + diff --git a/assets/www/js/media.js b/assets/www/js/media.js index bbb8ce3f..864f4f01 100644 --- a/assets/www/js/media.js +++ b/assets/www/js/media.js @@ -3,7 +3,6 @@ window.audioPlayer = function() { var availableMedia = []; var availableUrl = []; var menuArray = []; - var lastMenuStatus = false; /** * Function called with URL of file to be played. @@ -37,12 +36,6 @@ window.audioPlayer = function() { var term = app.getCurrentTitle(); var requestUrl = app.baseURL + "/w/api.php"; - if (lastMenuStatus){ - setMenuItemState('listen-sound',false, false); - console.log("disabling listen-in menu"); - lastMenuStatus = false; - } - var ending = ".*\.ogg"; $.ajax({ @@ -101,13 +94,7 @@ window.audioPlayer = function() { format: 'json' }, success: function(data) { - - if(!lastMenuStatus){ - setMenuItemState('listen-sound', true, false); - console.log("enabling listen-in menu"); - lastMenuStatus = true; - } - + for(var id in data.query.pages){ for (var im in data.query.pages[id].imageinfo){ @@ -160,6 +147,10 @@ window.audioPlayer = function() { menuArray = []; } + function isAvailable() { + return (availableUrl.length != 0); + } + /** * plays file that is clicked in the menu @@ -180,6 +171,7 @@ window.audioPlayer = function() { playAudio: playAudio, releaseMedia: releaseMedia, getMediaList: getMediaList, + isAvailable: isAvailable, createMenuArray: createMenuArray, clearMenuArray: clearMenuArray };