ignore npm tempfiles

.gitignore

@@ -1,3 +1,5 @@
 dist/js/*.js
 dist/css/*.css
 dist/css/*.svg
+package-lock.json
+node_modules

.minify.json

@@ -0,0 +1,8 @@
+{
+    "js": {
+        "type": "terser",
+        "terser": {
+            "mangle": false
+        }
+    }
+}

package.json

@@ -0,0 +1,18 @@
+{
+  "name": "myplayer",
+  "version": "1.0.0",
+  "description": "A Web-MP3-Player with Playlist Support",
+  "main": "src/player.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://tk-sls.de/git/tk-sls.de/myplayer.git"
+  },
+  "author": "tilt <tilt@linuxfoo.de>",
+  "license": "MIT",
+  "dependencies": {
+    "minify": "^11.4.1"
+  }
+}

src/build.sh

@@ -12,8 +12,8 @@ if ! cd "$dir" ; then
 elif ! mkdir -p "$jsdir" ; then
     echo "ERROR: Could not create directory $jsdir; aborted." >&2 ;
     exit 1 ;
-elif ! type yui-compressor > /dev/null ; then
-    echo "ERROR: Executable \"yui-compressor\" not found in PATH; aborted." >&2 ;
+elif ! type minify > /dev/null ; then
+    echo "ERROR: Executable \"minify\" not found in PATH; aborted." >&2 ;
     exit 1 ;
 fi
 
@@ -47,7 +47,7 @@ do
 done
 
 echo "INFO: Compressing player.js ..." >&2
-yui-compressor player.js >> "$jsdir"/myplayer.min.js
+minify player.js >> "$jsdir"/myplayer.min.js
 
 chmod 644 "$jsdir"/myplayer.min.js
 

src/player.js

@@ -21,26 +21,29 @@
  * THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE */
 
 var MyPlayer = function(_args) {
-   var failed = false;
-   var detached = false;
-   var player = null;
-
-   var defaultArgs = {
-      detachable: true,
-      element: 'body',
-      id3: false,
-      mode: 'mp3url',
-      waveform: false,
+    var failed = false,
+        detached = false,
+        player = null,
+        args_default = {
             autoplay: false,
+            css: { "height": "500px" },
+            detachable: true,
+            element: "body",
+            id3: false,
+            list: [],
             loop: true,
+            mode: "mp3url",
             shuffle: false,
-      list: []
-   };
+            waveform: false
+        },
+        args = (_args===undefined) ? args_default : $.extend({}, args_default, _args),
+        mimeTypeFromSrc = function(src) {
+            var extension = src.split(".").pop().toLowerCase();
 
-   var mimeTypeFromSrc = function(src) {
-      var extension = src.split('.').pop().toLowerCase();
-
-      return {
+            var types = {
+                "3g2": "video/3gpp2",
+                "3gp": "video/3gpp",
+                "7z": "application/x-7z-compressed",
                 "aac": "audio/aac",
                 "abw": "application/x-abiword",
                 "arc": "application/x-freearc",
@@ -55,11 +58,10 @@ var MyPlayer = function(_args) {
                 "css": "text/css",
                 "csv": "text/csv",
                 "doc": "application/msword",
-         "docx": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
                 "eot": "application/vnd.ms-fontobject",
                 "epub": "application/epub+zip",
-         "gz": "application/gzip",
                 "gif": "image/gif",
+                "gz": "application/gzip",
                 "htm": "text/html",
                 "html": "text/html",
                 "ico": "image/vnd.microsoft.icon",
@@ -85,11 +87,10 @@ var MyPlayer = function(_args) {
                 "ogx": "application/ogg",
                 "opus": "audio/opus",
                 "otf": "font/otf",
-         "png": "image/png",
                 "pdf": "application/pdf",
                 "php": "application/x-httpd-php",
+                "png": "image/png",
                 "ppt": "application/vnd.ms-powerpoint",
-         "pptx": "application/vnd.openxmlformats-officedocument.presentationml.presentation",
                 "rar": "application/vnd.rar",
                 "rtf": "application/rtf",
                 "sh": "application/x-sh",
@@ -110,40 +111,30 @@ var MyPlayer = function(_args) {
                 "woff2": "font/woff2",
                 "xhtml": "application/xhtml+xml",
                 "xls": "application/vnd.ms-excel",
-         "xlsx": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
                 "xml": "application/xml",
                 "xul": "application/vnd.mozilla.xul+xml",
-         "zip": "application/zip",
-         "3gp": "video/3gpp",
-         "3g2": "video/3gpp2",
-         "7z": "application/x-7z-compressed"
-      }[extension] || "application/octet-stream";
+                "zip": "application/zip"
             };
 
-   var args = (typeof(_args)==='undefined') 
-      ? defaultArgs 
-      : $.extend({}, defaultArgs, _args);   
-
-   var createAudio = function() {
+            return types[extension] || "application/octet-stream";
+        },
+        createAudio = function() {
             var autoplay = args.autoplay ? 'autoplay="true"' : '';
+            var styles = [];
+            var style;
+            var key;
 
-      $(args.element).append(
-         '<audio id="myplayer" controls="controls" ' + autoplay + '>'+
-            '<p>'+
-               'Your browser does not understand '+
-               'the &lt;audio&gt; tag. '+
-            '</p>'+
-         '</audio>'
-      );
+            for (key in args.css) {
+                var value = args.css[key];
+                styles.push(`${key}: ${value}`);
+            }
 
-      args.audio = args.element + ' audio';
-
-      $(args.audio).css({
-        'height': '500px',
-      });
-   };
-
-   var readId3 = function() {
+            style = styles.join(" ");
+            args.audio = $(`<audio id="myplayer" controls="controls" style="${style}" ${autoplay}></audio>`);
+            console.log("DEBUG: appending audio=", args.audio, " to element=", args.element, "  ...");
+            $(args.element).append(args.audio);
+        },
+        readId3 = function() {
             $(args.element).find('ul.mejs li').each(function(i, track){
                 var url = $(track).attr('data-url');
 
@@ -154,35 +145,57 @@ var MyPlayer = function(_args) {
                         var tags = tag.tags;
                         var track_title;
 
-               if(typeof(tags.title)!='undefined')
+                        if(typeof(tags.title)!='undefined') {
                              track_title = tags.title;
-               else
+                        }
+                        else {
                              track_title = url;
+                        }
 
-               if(typeof(tags.artist)!='undefined')
+                        if(typeof(tags.artist)!='undefined') {
                              track_title = tags.artist + ' - ' + track_title;
+                        }
 
                         $(args.element).find('ul.mejs li').each(function(j, _track){
-                   if(i==j)
+                             if(i==j) {
                                   $(_track).html(track_title);
+                             }
                         });
                     }
                 });
             });
-   };
-
-   var playerCreated = function() {
+        },
+        playerCreated = function(mediaElement, originalNode, instance) {
             restoreParams();
 
-      if(args.id3)
-         readId3();
-   };
+            if(args.shuffle) {
+                instance.shuffleCallback();
+            }
 
-   var createPlayer = function() {
+            if(args.loop) {
+                instance.loopCallback();
+            }
+
+            if(args.id3) {
+                readId3();
+            }
+        },
+        createPlayer = function() {
         player = new MediaElementPlayer(
                 "myplayer", {
                     success: playerCreated,
-            features: ['playpause', 'current', 'progress', 'duration', 'volume', 'playlist', 'prevtrack', 'nexttrack', 'shuffle', 'loop']
+                    features: [
+                         'playpause',
+                         'current',
+                         'progress',
+                         'duration',
+                         'volume',
+                         'playlist',
+                         'prevtrack',
+                         'nexttrack',
+                         'shuffle',
+                         'loop'
+                    ]
             });
 
             $(args.element).append(
@@ -190,25 +203,25 @@ var MyPlayer = function(_args) {
                     'The player is currently detached.'+
                 '</p>'
             );
-   };
-
-   var param = function(name) {
+        },
+        param = function(name) {
             var query = window.location.search.substring(1);
             var vars = query.split("&");
 
-      for(var i=0; i<vars.length; i++) {
+            for(i=0; i<vars.length; i++) {
                 var pair = vars[i].split("=");
 
-         if(pair[0] == name)
+                if(pair[0] == name) {
                     return pair[1];
                 }
+            }
 
             return false;
-   };
-
-   var setupDetach = function() {
-      if(!args.detachable)
+        },
+        setupDetach = function() {
+            if(!args.detachable) {
                 return;
+            }
 
             var popup = function(url) {
                 player.pause();
@@ -222,8 +235,9 @@ var MyPlayer = function(_args) {
                     'resizable=false'
                 );
 
-         if(window.focus) 
+                if(window.focus) {
                     playerWindow.focus();
+                }
 
                 $("iframe",top.document).height(20);
 
@@ -248,8 +262,9 @@ var MyPlayer = function(_args) {
                     var trackNo = 0;
 
                     $(args.element).find('ul.mejs li').each(function(i){
-               if($(this).hasClass('current'))
+                        if($(this).hasClass('current')) {
                              trackNo = i;
+                        }
                     });
 
                     popup(
@@ -271,11 +286,11 @@ var MyPlayer = function(_args) {
                     $('.playerDetached', opener.document).hide();
                 };
             }
-   };
-
-   var restoreParams = function() {
-      if(!detached)
+        },
+        restoreParams = function() {
+            if(!detached) {
                 return;
+            }
 
             var paused = (param('paused') && param('paused')=='true');
             var currentTime = param('currentTime') ? parseFloat(param('currentTime')) : 0.0;
@@ -291,19 +306,20 @@ var MyPlayer = function(_args) {
                 }
             });
 
-      if(paused)
+            if(paused) {
                 player.pause();
+            }
         };
 
     if(param('popup')!==false) {
         detached = true;
 
         $('body').html(
-         '<div '+
-            'id="myplayer" '+
-            'style="'+
-               'width: '+$(args.element).width()+'px; '+
-               'height: '+$(args.element).height()+' px;'+
+            '<div ' +
+                'id="myplayer" ' +
+                'style="' +
+                    'width: ' + $(args.element).width() + 'px; '+
+                    'height: ' + $(args.element).height() + ' px;'+
             '"></div>'
         );
 
@@ -311,6 +327,7 @@ var MyPlayer = function(_args) {
     }
 
     if(args.mode=='mp3url') {
+        console.log("args.mode=", args.mode);
         var mp3url = (typeof args.mp3url === "undefined")
             ? $(location).attr('href').replace(/\?.*/, '').replace(/\/[^\/]+\/?$/, '')
             : args.mp3url;
@@ -319,12 +336,15 @@ var MyPlayer = function(_args) {
             url: mp3url,
             type: 'GET',
             success: function(res) {
-            createAudio();
+                var doc;
+                var head;
 
-            var doc = document.createElement('html');
+                doc = document.createElement('html');
+
+                createAudio();
                 doc.innerHTML = res;
 
-            var head = $(doc).find('a').each(function(idx,item) {
+                head = $(doc).find('a').each(function(idx,item) {
                     var src = $(item).attr('href');
 
                     if(src.match(/\.mp3$/)) {
@@ -332,7 +352,7 @@ var MyPlayer = function(_args) {
                         var title = item.innerHTML;
                         var type = "audio/mpeg";
 
-                  $(args.audio).append('<source src="'+url+'" type="' + type + '"  title="'+title+'"/>');
+                        args.audio.append(`<source src="${url}" type="${type}" title="${title}"/>`);
                      }
                 });
 
@@ -350,71 +370,77 @@ var MyPlayer = function(_args) {
 
         $.get(m3u, function(txt){
             var lines = txt.split("\n");
+            var len = lines.length;
+            var i = 0;
 
-         for(var i = 0, len = lines.length; i < len; i++)
+            while(i < len) {
                 if(!lines[i].match(/^[ \t]*#/) && lines[i].match(/\.mp3$/)) {
                      var mp3 = lines[i];
                      var title = unescape(mp3.split('/').pop());
                      var type = "audio/mpeg";
 
-                $(args.audio).append('<source src="'+mp3+'" type="' + type + '"  title="'+title+'"/>');
+                     args.audio.append(`<source src="${mp3}" type="${type}" title="${title}"/>`);
                 }
 
-         console.log("DEBUG: mode==m3u audio=",$(args.audio));
+                i++;
+            }
 
             createPlayer();
             setupDetach();
         });
     }
     else if(args.mode=='list') {
+        var len = args.list.length;
+        var i = 0;
+
         createAudio();
 
-      for(var i = 0, len = args.list.length; i < len; i++) {
+        while(i < len) {
              var item = args.list[i];
              var type = typeof item;
              var src = '';
              var title = '';
+             var type;
 
              if(item !== null && type === 'object') {
-             if(item.url)
+                 if(item.url) {
                      src = item.url;
+                 }
                  else {
-                alert(
-                    'MyPlayer: item[' + i + ']: '+
-                    'property "url" is missing.'
-                );
-
+                     alert(`MyPlayer: item[${i}]: property "url" is missing.`);
+                     i++;
                      continue;
                  }
 
-             if(item.title)
+                 if(item.title) {
                      title = item.title;
-             else
+                 }
+                 else {
                      title = url.replace(/(.*\/)?([^\/]+)/, '$2');
                  }
+             }
              else if(type === 'string') {
                  src = item;
                  title = src;
              }
              else {
-             alert(
-                'MyPlayer: item [' + i + ']: '+
-                'unsupported type "' + type + '"'
-             );
-
+                 alert(`MyPlayer: item[${i}]: unsupported type=${type}.`);
+                 i++;
                  continue;
              }
 
-          var type = mimeTypeFromSrc(src);
+             type = mimeTypeFromSrc(src);
 
-          $(args.audio).append('<source src="'+src+'" type="' + type + '" title="'+title+'"/>');
+             args.audio.append(`<source src="${src}" type="${type}" title="${type}"/>`);
+
+             i++;
         }
 
         createPlayer();
         setupDetach();
     }
     else {
-      $(args.element).append('<p>Unsupported mode "'+args.mode+'"</p>');
+        $(args.element).append(`<p>Unsupported mode ${args.mode}"</p>`);
         failed = true;
     }
 };