From e71a4598f172b60330d0c13b17cea30e96f86699 Mon Sep 17 00:00:00 2001 From: fergalmoran Date: Mon, 22 Apr 2013 15:31:39 +0100 Subject: [PATCH] Added to .gitignore --- .gitignore | 7 ++++++- static/js/com.podnoms.player.js | 8 +------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 4a39be4..2f152b7 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,9 @@ media/* build/* _working/* static/CACHE/* -dss/localsettings.py \ No newline at end of file +dss/localsettings.py +dss.conf +dss/debugsettings.py +mysql +test.py + diff --git a/static/js/com.podnoms.player.js b/static/js/com.podnoms.player.js index 5ad23f9..e9a216b 100644 --- a/static/js/com.podnoms.player.js +++ b/static/js/com.podnoms.player.js @@ -24,10 +24,6 @@ soundManager.useThrottling = true; soundManager.flashVersion = 9; soundManager.useFlashBlock = false; soundManager.useHTML5Audio = true; -soundManager.preferFlash = false; -soundManager.debugMode = com.podnoms.settings.smDebugMode; -soundManager.debugFlash = com.podnoms.settings.smDebugMode; -soundManager.useFlashBlock = !com.podnoms.settings.smDebugMode; com.podnoms.player = { /*Members*/ @@ -80,7 +76,6 @@ com.podnoms.player = { moment(elapsed).format("HH:mm") : moment(elapsed).format("mm:ss"); this.timeDisplayLabel.text(text); - el.append(item.clone().text(text).css('width', '10%')); }, _mouseDown: function (event) { if (this.currentSound != null) { @@ -189,10 +184,9 @@ com.podnoms.player = { options.success(); } else { + com.podnoms.utils.showError('Oooopsies', 'Error playing sound..'); if (options.error) options.error(); - else - com.podnoms.utils.showError('Oooopsies', 'Error playing sound..'); } }); //create the floating time display label