diff options
author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-10-29 19:59:21 +0000 |
---|---|---|
committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-10-29 19:59:21 +0000 |
commit | c157e9fdd65ff3d1f2d3e8fda03aaf4f1143cdbb (patch) | |
tree | 4d1603847262462e78f9e3faa2f33d1ab364ea5c /modules | |
parent | c63317e869d1da28ab3a429bf4116446f9bcbc64 (diff) | |
download | ampache-c157e9fdd65ff3d1f2d3e8fda03aaf4f1143cdbb.tar.gz ampache-c157e9fdd65ff3d1f2d3e8fda03aaf4f1143cdbb.tar.bz2 ampache-c157e9fdd65ff3d1f2d3e8fda03aaf4f1143cdbb.zip |
moving some stuff around, fixed a few stylesheet bugs and a sorting issue on albums
Diffstat (limited to 'modules')
-rw-r--r-- | modules/flash/FMP3.swf | bin | 8103 -> 0 bytes | |||
-rw-r--r-- | modules/flash/FlashObject.js | 219 | ||||
-rw-r--r-- | modules/flash/XSPF_EV.swf | bin | 7447 -> 0 bytes | |||
-rw-r--r-- | modules/flash/docs/FMP3_readme.txt | 20 | ||||
-rw-r--r-- | modules/flash/docs/XSPF_EV_readme.txt | 24 | ||||
-rw-r--r-- | modules/flash/license.txt | 10 |
6 files changed, 10 insertions, 263 deletions
diff --git a/modules/flash/FMP3.swf b/modules/flash/FMP3.swf Binary files differdeleted file mode 100644 index c7ba021c..00000000 --- a/modules/flash/FMP3.swf +++ /dev/null diff --git a/modules/flash/FlashObject.js b/modules/flash/FlashObject.js deleted file mode 100644 index fb48b9be..00000000 --- a/modules/flash/FlashObject.js +++ /dev/null @@ -1,219 +0,0 @@ -/** - * SWFObject v1.4.4: Flash Player detection and embed - http://blog.deconcept.com/swfobject/ - * - * SWFObject is (c) 2006 Geoff Stearns and is released under the MIT License: - * http://www.opensource.org/licenses/mit-license.php - * - * **SWFObject is the SWF embed script formerly known as FlashObject. The name was changed for - * legal reasons. - */ -if(typeof deconcept == "undefined") var deconcept = new Object(); -if(typeof deconcept.util == "undefined") deconcept.util = new Object(); -if(typeof deconcept.SWFObjectUtil == "undefined") deconcept.SWFObjectUtil = new Object(); -deconcept.SWFObject = function(swf, id, w, h, ver, c, useExpressInstall, quality, xiRedirectUrl, redirectUrl, detectKey){ - if (!document.getElementById) { return; } - this.DETECT_KEY = detectKey ? detectKey : 'detectflash'; - this.skipDetect = deconcept.util.getRequestParameter(this.DETECT_KEY); - this.params = new Object(); - this.variables = new Object(); - this.attributes = new Array(); - if(swf) { this.setAttribute('swf', swf); } - if(id) { this.setAttribute('id', id); } - if(w) { this.setAttribute('width', w); } - if(h) { this.setAttribute('height', h); } - if(ver) { this.setAttribute('version', new deconcept.PlayerVersion(ver.toString().split("."))); } - this.installedVer = deconcept.SWFObjectUtil.getPlayerVersion(); - if(c) { this.addParam('bgcolor', c); } - var q = quality ? quality : 'high'; - this.addParam('quality', q); - this.setAttribute('useExpressInstall', useExpressInstall); - this.setAttribute('doExpressInstall', false); - var xir = (xiRedirectUrl) ? xiRedirectUrl : window.location; - this.setAttribute('xiRedirectUrl', xir); - this.setAttribute('redirectUrl', ''); - if(redirectUrl) { this.setAttribute('redirectUrl', redirectUrl); } -} -deconcept.SWFObject.prototype = { - setAttribute: function(name, value){ - this.attributes[name] = value; - }, - getAttribute: function(name){ - return this.attributes[name]; - }, - addParam: function(name, value){ - this.params[name] = value; - }, - getParams: function(){ - return this.params; - }, - addVariable: function(name, value){ - this.variables[name] = value; - }, - getVariable: function(name){ - return this.variables[name]; - }, - getVariables: function(){ - return this.variables; - }, - getVariablePairs: function(){ - var variablePairs = new Array(); - var key; - var variables = this.getVariables(); - for(key in variables){ - variablePairs.push(key +"="+ variables[key]); - } - return variablePairs; - }, - getSWFHTML: function() { - var swfNode = ""; - if (navigator.plugins && navigator.mimeTypes && navigator.mimeTypes.length) { // netscape plugin architecture - if (this.getAttribute("doExpressInstall")) { this.addVariable("MMplayerType", "PlugIn"); } - swfNode = '<embed type="application/x-shockwave-flash" src="'+ this.getAttribute('swf') +'" width="'+ this.getAttribute('width') +'" height="'+ this.getAttribute('height') +'"'; - swfNode += ' id="'+ this.getAttribute('id') +'" name="'+ this.getAttribute('id') +'" '; - var params = this.getParams(); - for(var key in params){ swfNode += [key] +'="'+ params[key] +'" '; } - var pairs = this.getVariablePairs().join("&"); - if (pairs.length > 0){ swfNode += 'flashvars="'+ pairs +'"'; } - swfNode += '/>'; - } else { // PC IE - if (this.getAttribute("doExpressInstall")) { this.addVariable("MMplayerType", "ActiveX"); } - swfNode = '<object id="'+ this.getAttribute('id') +'" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="'+ this.getAttribute('width') +'" height="'+ this.getAttribute('height') +'">'; - swfNode += '<param name="movie" value="'+ this.getAttribute('swf') +'" />'; - var params = this.getParams(); - for(var key in params) { - swfNode += '<param name="'+ key +'" value="'+ params[key] +'" />'; - } - var pairs = this.getVariablePairs().join("&"); - if(pairs.length > 0) {swfNode += '<param name="flashvars" value="'+ pairs +'" />';} - swfNode += "</object>"; - } - return swfNode; - }, - write: function(elementId){ - if(this.getAttribute('useExpressInstall')) { - // check to see if we need to do an express install - var expressInstallReqVer = new deconcept.PlayerVersion([6,0,65]); - if (this.installedVer.versionIsValid(expressInstallReqVer) && !this.installedVer.versionIsValid(this.getAttribute('version'))) { - this.setAttribute('doExpressInstall', true); - this.addVariable("MMredirectURL", escape(this.getAttribute('xiRedirectUrl'))); - document.title = document.title.slice(0, 47) + " - Flash Player Installation"; - this.addVariable("MMdoctitle", document.title); - } - } - if(this.skipDetect || this.getAttribute('doExpressInstall') || this.installedVer.versionIsValid(this.getAttribute('version'))){ - var n = (typeof elementId == 'string') ? document.getElementById(elementId) : elementId; - n.innerHTML = this.getSWFHTML(); - return true; - }else{ - if(this.getAttribute('redirectUrl') != "") { - document.location.replace(this.getAttribute('redirectUrl')); - } - } - return false; - } -} - -/* ---- detection functions ---- */ -deconcept.SWFObjectUtil.getPlayerVersion = function(){ - var PlayerVersion = new deconcept.PlayerVersion([0,0,0]); - if(navigator.plugins && navigator.mimeTypes.length){ - var x = navigator.plugins["Shockwave Flash"]; - if(x && x.description) { - PlayerVersion = new deconcept.PlayerVersion(x.description.replace(/([a-zA-Z]|\s)+/, "").replace(/(\s+r|\s+b[0-9]+)/, ".").split(".")); - } - }else{ - // do minor version lookup in IE, but avoid fp6 crashing issues - // see http://blog.deconcept.com/2006/01/11/getvariable-setvariable-crash-internet-explorer-flash-6/ - try{ - var axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7"); - }catch(e){ - try { - var axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6"); - PlayerVersion = new deconcept.PlayerVersion([6,0,21]); - axo.AllowScriptAccess = "always"; // throws if player version < 6.0.47 (thanks to Michael Williams @ Adobe for this code) - } catch(e) { - if (PlayerVersion.major == 6) { - return PlayerVersion; - } - } - try { - axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash"); - } catch(e) {} - } - if (axo != null) { - PlayerVersion = new deconcept.PlayerVersion(axo.GetVariable("$version").split(" ")[1].split(",")); - } - } - return PlayerVersion; -} -deconcept.PlayerVersion = function(arrVersion){ - this.major = arrVersion[0] != null ? parseInt(arrVersion[0]) : 0; - this.minor = arrVersion[1] != null ? parseInt(arrVersion[1]) : 0; - this.rev = arrVersion[2] != null ? parseInt(arrVersion[2]) : 0; -} -deconcept.PlayerVersion.prototype.versionIsValid = function(fv){ - if(this.major < fv.major) return false; - if(this.major > fv.major) return true; - if(this.minor < fv.minor) return false; - if(this.minor > fv.minor) return true; - if(this.rev < fv.rev) return false; - return true; -} -/* ---- get value of query string param ---- */ -deconcept.util = { - getRequestParameter: function(param) { - var q = document.location.search || document.location.hash; - if(q) { - var pairs = q.substring(1).split("&"); - for (var i=0; i < pairs.length; i++) { - if (pairs[i].substring(0, pairs[i].indexOf("=")) == param) { - return pairs[i].substring((pairs[i].indexOf("=")+1)); - } - } - } - return ""; - } -} -/* fix for video streaming bug */ -deconcept.SWFObjectUtil.cleanupSWFs = function() { - if (window.opera || !document.all) return; - var objects = document.getElementsByTagName("OBJECT"); - for (var i=0; i < objects.length; i++) { - objects[i].style.display = 'none'; - for (var x in objects[i]) { - if (typeof objects[i][x] == 'function') { - objects[i][x] = function(){}; - } - } - } -} -// fixes bug in fp9 see http://blog.deconcept.com/2006/07/28/swfobject-143-released/ -deconcept.SWFObjectUtil.prepUnload = function() { - __flash_unloadHandler = function(){}; - __flash_savedUnloadHandler = function(){}; - if (typeof window.onunload == 'function') { - var oldUnload = window.onunload; - window.onunload = function() { - deconcept.SWFObjectUtil.cleanupSWFs(); - oldUnload(); - } - } else { - window.onunload = deconcept.SWFObjectUtil.cleanupSWFs; - } -} -if (typeof window.onbeforeunload == 'function') { - var oldBeforeUnload = window.onbeforeunload; - window.onbeforeunload = function() { - deconcept.SWFObjectUtil.prepUnload(); - oldBeforeUnload(); - } -} else { - window.onbeforeunload = deconcept.SWFObjectUtil.prepUnload; -} -/* add Array.push if needed (ie5) */ -if (Array.prototype.push == null) { Array.prototype.push = function(item) { this[this.length] = item; return this.length; }} - -/* add some aliases for ease of use/backwards compatibility */ -var getQueryParamValue = deconcept.util.getRequestParameter; -var FlashObject = deconcept.SWFObject; // for legacy support -var SWFObject = deconcept.SWFObject; diff --git a/modules/flash/XSPF_EV.swf b/modules/flash/XSPF_EV.swf Binary files differdeleted file mode 100644 index 57b5416e..00000000 --- a/modules/flash/XSPF_EV.swf +++ /dev/null diff --git a/modules/flash/docs/FMP3_readme.txt b/modules/flash/docs/FMP3_readme.txt deleted file mode 100644 index e9fe2ac4..00000000 --- a/modules/flash/docs/FMP3_readme.txt +++ /dev/null @@ -1,20 +0,0 @@ -
------------------------------------------
-////// FLASH MP3 PLAYER - FMP3 //////
------------------------------------------
-
-http://www.enricolai.com/FMP3/
-
-Applicazione distribuita sotto licenza Creative Commons
-http://creativecommons.org/licenses/by-nc-nd/2.5/
-
-
-Condizioni di utilizzo
-Prima di utilizzare l'applicazione accertatevi di aver letto le condizioni di utilizzo alla pagina http://www.enricolai.com/FMP3/
-
-
-
-
-
-
-
diff --git a/modules/flash/docs/XSPF_EV_readme.txt b/modules/flash/docs/XSPF_EV_readme.txt deleted file mode 100644 index 6ef812b7..00000000 --- a/modules/flash/docs/XSPF_EV_readme.txt +++ /dev/null @@ -1,24 +0,0 @@ -----------------------------------------------------------
-////// FLASH MP3 PLAYER - XSPF Player for FMP3 //////
-----------------------------------------------------------
-
-
-http://www.enricolai.com/FMP3/XSPF-player-extended-version.asp
-
-Applicazione distribuita sotto licenza Creative Commons
-http://creativecommons.org/licenses/by-nc-nd/2.5/
-
-
-Condizioni di utilizzo
-Prima di utilizzare l'applicazione accertatevi di aver letto le condizioni di utilizzo alle pagine
-
-http://www.enricolai.com/FMP3/
-
-http://www.enricolai.com/fmp3/xspf-flash-mp3-player.asp
-
-
-
-
-
-
-
diff --git a/modules/flash/license.txt b/modules/flash/license.txt new file mode 100644 index 00000000..12d609e1 --- /dev/null +++ b/modules/flash/license.txt @@ -0,0 +1,10 @@ +Copyright (c) 2005, Fabricio Zuardi
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ * Neither the name of the author nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|