From b70bd6445ac56ca027afa09ab6bab0107f322c50 Mon Sep 17 00:00:00 2001
From: Niv Sardi <xaiki@evilgiggle.com>
Date: Thu, 29 Oct 2015 14:58:05 -0300
Subject: [PATCH 1/8] don't recreate player if id given

Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
---
 index.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/index.js b/index.js
index 0654aa2..c198297 100644
--- a/index.js
+++ b/index.js
@@ -213,21 +213,21 @@ wjs.prototype.prev = function() {
 }
 
 wjs.prototype.addPlayer = function(wcpSettings) {
-    
+
     if (wcpSettings) newid = (typeof wcpSettings["id"] === "undefined") ? "webchimera" : wcpSettings["id"]; // if no id set, default to "webchimera"
     else newid = "webchimera";
-    
-    if (window.document.getElementById(newid) !== null) {
+
+    if (!wcpSettings.id && window.document.getElementById(newid) !== null) {
         for (i = 2; window.document.getElementById(newid +i) !== null; i++) { }
         newid = newid +i;
     }
-    
+
     if (typeof newid === 'string') {
         if (newid.substring(0,1) == "#") var targetid = ' id="'+newid.substring(1)+'" class="wcp-wrapper"';
         else if (newid.substring(0,1) == ".") { var targetid = ' id="webchimera" class="'+newid.substring(1)+' wcp-wrapper"'; newid = "#webchimera"; }
         else { var targetid = ' id="'+newid+'" class="wcp-wrapper"'; newid = "#"+newid; }
     } else { var targetid = ' id="webchimera" class="wcp-wrapper"'; newid = "#webchimera"; }
-    
+
     vlcs[newid] = {};
     vlcs[newid].events = new events.EventEmitter();
 

From fbe9f80879a9c1519a4eea916d70daaff252d1d3 Mon Sep 17 00:00:00 2001
From: Niv Sardi <xaiki@evilgiggle.com>
Date: Thu, 29 Oct 2015 15:19:57 -0300
Subject: [PATCH 2/8] add attach parameter to make magics people happy

Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
---
 index.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/index.js b/index.js
index c198297..bd6f991 100644
--- a/index.js
+++ b/index.js
@@ -213,11 +213,12 @@ wjs.prototype.prev = function() {
 }
 
 wjs.prototype.addPlayer = function(wcpSettings) {
+    var attach = wcpSettings.attach;
 
     if (wcpSettings) newid = (typeof wcpSettings["id"] === "undefined") ? "webchimera" : wcpSettings["id"]; // if no id set, default to "webchimera"
     else newid = "webchimera";
 
-    if (!wcpSettings.id && window.document.getElementById(newid) !== null) {
+    if (! attach && window.document.getElementById(newid) !== null) {
         for (i = 2; window.document.getElementById(newid +i) !== null; i++) { }
         newid = newid +i;
     }
@@ -247,22 +248,23 @@ wjs.prototype.addPlayer = function(wcpSettings) {
     opts[newid].zoom = 1;
     if (typeof opts[newid].allowFullscreen === 'undefined') opts[newid].allowFullscreen = true;
 
-    playerbody = '<div' + targetid + ' style="height: 100%"><div class="wcp-center" style="overflow: hidden"><canvas class="wcp-canvas wcp-center"></canvas></div><div class="wcp-surface"></div><div class="wcp-menu wcp-playlist wcp-center"><div class="wcp-menu-close"></div><div class="wcp-menu-title">Playlist Menu</div><ul class="wcp-menu-items wcp-playlist-items"></ul></div><div class="wcp-menu wcp-subtitles wcp-center"><div class="wcp-menu-close"></div><div class="wcp-menu-title">Subtitle Menu</div><ul class="wcp-menu-items wcp-subtitles-items"></ul></div><div class="wcp-pause-anim wcp-center"><i class="wcp-anim-basic wcp-anim-icon-play"></i></div><div class="wcp-titlebar"><span class="wcp-title"></span></div><div class="wcp-toolbar"><div></div><div class="wcp-progress-bar"><div class="wcp-progress-seen"></div><div class="wcp-progress-pointer"></div></div><div class="wcp-button wcp-left wcp-prev" style="display: none"></div><div class="wcp-button wcp-left wcp-pause"></div><div class="wcp-button wcp-left wcp-next" style="display: none"></div><div class="wcp-button wcp-left wcp-vol-button wcp-volume-medium"></div><div class="wcp-vol-control"><div class="wcp-vol-bar"><div class="wcp-vol-bar-full"></div><div class="wcp-vol-bar-pointer"></div></div></div><div class="wcp-time"><span class="wcp-time-current"></span><span class="wcp-time-total"></span></div><div class="wcp-button wcp-right wcp-maximize"';
-    if (!opts[newid].allowFullscreen) playerbody += ' style="cursor: not-allowed; color: rgba(123,123,123,0.6);"';
-    playerbody += '></div><div class="wcp-button wcp-right wcp-playlist-but"></div><div class="wcp-button wcp-right wcp-subtitle-but"></div></div><div class="wcp-status"></div><div class="wcp-notif"></div><div class="wcp-subtitle-text"></div><div class="wcp-tooltip"><div class="wcp-tooltip-arrow"></div><div class="wcp-tooltip-inner">00:00</div></div></div>';
-    
+    if (! attach) {
+        playerbody = '<div' + targetid + ' style="height: 100%"><div class="wcp-center" style="overflow: hidden"><canvas class="wcp-canvas wcp-center"></canvas></div><div class="wcp-surface"></div><div class="wcp-menu wcp-playlist wcp-center"><div class="wcp-menu-close"></div><div class="wcp-menu-title">Playlist Menu</div><ul class="wcp-menu-items wcp-playlist-items"></ul></div><div class="wcp-menu wcp-subtitles wcp-center"><div class="wcp-menu-close"></div><div class="wcp-menu-title">Subtitle Menu</div><ul class="wcp-menu-items wcp-subtitles-items"></ul></div><div class="wcp-pause-anim wcp-center"><i class="wcp-anim-basic wcp-anim-icon-play"></i></div><div class="wcp-titlebar"><span class="wcp-title"></span></div><div class="wcp-toolbar"><div></div><div class="wcp-progress-bar"><div class="wcp-progress-seen"></div><div class="wcp-progress-pointer"></div></div><div class="wcp-button wcp-left wcp-prev" style="display: none"></div><div class="wcp-button wcp-left wcp-pause"></div><div class="wcp-button wcp-left wcp-next" style="display: none"></div><div class="wcp-button wcp-left wcp-vol-button wcp-volume-medium"></div><div class="wcp-vol-control"><div class="wcp-vol-bar"><div class="wcp-vol-bar-full"></div><div class="wcp-vol-bar-pointer"></div></div></div><div class="wcp-time"><span class="wcp-time-current"></span><span class="wcp-time-total"></span></div><div class="wcp-button wcp-right wcp-maximize"';
+        if (!opts[newid].allowFullscreen) playerbody += ' style="cursor: not-allowed; color: rgba(123,123,123,0.6);"';
+        playerbody += '></div><div class="wcp-button wcp-right wcp-playlist-but"></div><div class="wcp-button wcp-right wcp-subtitle-but"></div></div><div class="wcp-status"></div><div class="wcp-notif"></div><div class="wcp-subtitle-text"></div><div class="wcp-tooltip"><div class="wcp-tooltip-arrow"></div><div class="wcp-tooltip-inner">00:00</div></div></div>';
+        $(this.context).each(function(ij,el) { if (!$(el).hasClass("webchimeras")) $(el).addClass("webchimeras"); el.innerHTML = playerbody; });
+    }
+
     opts[newid].currentSub = 0;
     opts[newid].trackSub = -1;
-    
-    $(this.context).each(function(ij,el) { if (!$(el).hasClass("webchimeras")) $(el).addClass("webchimeras"); el.innerHTML = playerbody; });
-    
+
     if (vlcs[newid].multiscreen) {
         vlcs[newid].multiscreen = (typeof wcpSettings["multiscreen"] === "undefined") ? false : wcpSettings["multiscreen"];
         $(newid).find(".wcp-toolbar").hide(0);
         $(newid).find(".wcp-tooltip").hide(0);
         wjs(newid).wrapper.css({cursor: 'pointer'});
     }
-    
+
     wjs(newid).canvas = $(newid)[0].firstChild.firstChild;
 
     // resize video when window is resized

From ee8a89c78f91e2a9452dff49b8d9bc7976fa780f Mon Sep 17 00:00:00 2001
From: Niv Sardi <xaiki@evilgiggle.com>
Date: Thu, 29 Oct 2015 15:59:51 -0300
Subject: [PATCH 3/8] cache wjse

Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
---
 index.js | 86 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 47 insertions(+), 39 deletions(-)

diff --git a/index.js b/index.js
index bd6f991..297118d 100644
--- a/index.js
+++ b/index.js
@@ -74,7 +74,6 @@ function wjs(context) {
     if (this.context.substring(0,1) == "#") {
         if (window.document.getElementById(this.context.substring(1)).firstChild) {
             this.wrapper = window.document.getElementById(this.context.substring(1));
-            this.canvas = this.wrapper.firstChild.firstChild;
             this.wrapper = $(this.wrapper);
         }
         this.allElements = [window.document.getElementById(this.context.substring(1))];
@@ -82,13 +81,14 @@ function wjs(context) {
         if (this.context.substring(0,1) == ".") this.allElements = window.document.getElementsByClassName(this.context.substring(1));
         else this.allElements = window.document.getElementsByTagName(this.context);
         this.wrapper = this.allElements[0];
-        this.canvas = this.wrapper.firstChild.firstChild;
         this.wrapper = $(this.wrapper);
     }
     if (vlcs[this.context]) {
         this.vlc = vlcs[this.context].vlc;
         this.renderer = vlcs[this.context].renderer;
     }
+
+    this.canvas = $('canvas', this.wrapper)[0]
     return this;
 }
 
@@ -207,7 +207,7 @@ wjs.prototype.prev = function() {
         if (noDisabled) return false;
 
         this.playItem(i);
-        
+
         return this;
     } else return false;
 }
@@ -215,14 +215,19 @@ wjs.prototype.prev = function() {
 wjs.prototype.addPlayer = function(wcpSettings) {
     var attach = wcpSettings.attach;
 
-    if (wcpSettings) newid = (typeof wcpSettings["id"] === "undefined") ? "webchimera" : wcpSettings["id"]; // if no id set, default to "webchimera"
-    else newid = "webchimera";
+    if (attach) {
+        newid = attach;
+    } else {
+        if (wcpSettings) newid = (typeof wcpSettings["id"] === "undefined") ? "webchimera" : wcpSettings["id"]; // if no id set, default to "webchimera"
+        else newid = "webchimera";
 
-    if (! attach && window.document.getElementById(newid) !== null) {
-        for (i = 2; window.document.getElementById(newid +i) !== null; i++) { }
-        newid = newid +i;
+        if (! attach && window.document.getElementById(newid) !== null) {
+            for (i = 2; window.document.getElementById(newid +i) !== null; i++) { }
+            newid = newid +i;
+        }
     }
 
+
     if (typeof newid === 'string') {
         if (newid.substring(0,1) == "#") var targetid = ' id="'+newid.substring(1)+'" class="wcp-wrapper"';
         else if (newid.substring(0,1) == ".") { var targetid = ' id="webchimera" class="'+newid.substring(1)+' wcp-wrapper"'; newid = "#webchimera"; }
@@ -258,14 +263,16 @@ wjs.prototype.addPlayer = function(wcpSettings) {
     opts[newid].currentSub = 0;
     opts[newid].trackSub = -1;
 
+    var wjse = wjs(newid);
+
     if (vlcs[newid].multiscreen) {
         vlcs[newid].multiscreen = (typeof wcpSettings["multiscreen"] === "undefined") ? false : wcpSettings["multiscreen"];
         $(newid).find(".wcp-toolbar").hide(0);
         $(newid).find(".wcp-tooltip").hide(0);
-        wjs(newid).wrapper.css({cursor: 'pointer'});
+        wjse.wrapper.css({cursor: 'pointer'});
     }
 
-    wjs(newid).canvas = $(newid)[0].firstChild.firstChild;
+    wjse.canvas = $(newid)[0].firstChild.firstChild;
 
     // resize video when window is resized
     if (firstTime) {
@@ -282,7 +289,7 @@ wjs.prototype.addPlayer = function(wcpSettings) {
         }(newid));
     }
 
-    wjs(newid).wrapper.find(".wcp-menu-close").click(function() {
+    wjse.wrapper.find(".wcp-menu-close").click(function() {
         if ($(this).parents(".wcp-wrapper").find(".wcp-playlist").is(":visible")) {
             $(".wcp-playlist-items").sortable("destroy");
             $(this).parents(".wcp-wrapper").find(".wcp-playlist").hide(0);
@@ -292,7 +299,7 @@ wjs.prototype.addPlayer = function(wcpSettings) {
     });
 
     // toolbar button actions
-    wjs(newid).wrapper.find(".wcp-button").click(function() {
+    wjse.wrapper.find(".wcp-button").click(function() {
         wjsPlayer = getContext(this);
         vlc = wjsPlayer.vlc;
         buttonClass = this.className.replace("wcp-button","").replace("wcp-left","").replace("wcp-vol-button","").replace("wcp-right","").split(" ").join("");
@@ -318,7 +325,7 @@ wjs.prototype.addPlayer = function(wcpSettings) {
     });
     
     // surface click actions
-    wjs(newid).wrapper.find(".wcp-surface").click(function() {
+    wjse.wrapper.find(".wcp-surface").click(function() {
         wjsPlayer = getContext(this);
         if (wjsPlayer.stateInt() == 6) {
             wjsPlayer.find(".wcp-replay").trigger("click");
@@ -333,8 +340,8 @@ wjs.prototype.addPlayer = function(wcpSettings) {
         }
         if ([5].indexOf(wjsPlayer.vlc.state) > -1 && !wjsPlayer.playing() && wjsPlayer.itemCount() > 0) wjsPlayer.play().animatePause();
     });
-    
-    wjs(newid).wrapper.find(".wcp-surface").dblclick(function() {
+
+    wjse.wrapper.find(".wcp-surface").dblclick(function() {
         wjsPlayer = getContext(this);
         if (opts[wjsPlayer.context].allowFullscreen) {
             wjsPlayer.find(".wcp-anim-basic").finish();
@@ -342,8 +349,8 @@ wjs.prototype.addPlayer = function(wcpSettings) {
             wjsPlayer.toggleFullscreen();
         }
     });
-    
-    wjs(newid).wrapper.parent().bind("mousemove",function(e) {
+
+    wjse.wrapper.parent().bind("mousemove",function(e) {
         wjsPlayer = getContext(this);
         if (opts[wjsPlayer.context].uiHidden === false) {
             if (vlcs[wjsPlayer.context].multiscreen && window.document.webkitFullscreenElement == null) {
@@ -351,7 +358,7 @@ wjs.prototype.addPlayer = function(wcpSettings) {
             } else {
                 clearTimeout(vlcs[wjsPlayer.context].hideUI);
                 wjsPlayer.wrapper.css({cursor: 'default'});
-                
+
                 if (window.document.webkitFullscreenElement == null) {
                     if (["both","minimized"].indexOf(opts[wjsPlayer.context].titleBar) > -1) {
                         wjsPlayer.find(".wcp-titlebar").stop().show(0);
@@ -365,7 +372,7 @@ wjs.prototype.addPlayer = function(wcpSettings) {
                         if (wjsPlayer.find(".wcp-notif").css("top") == "10px") wjsPlayer.find(".wcp-notif").css("top", "35px");
                     }
                 }
-    
+
                 wjsPlayer.find(".wcp-toolbar").stop().show(0);
                 if (!volDrag && !seekDrag) {
                     if ($(wjsPlayer.find(".wcp-toolbar").selector + ":hover").length > 0) {
@@ -376,33 +383,33 @@ wjs.prototype.addPlayer = function(wcpSettings) {
             }
         } else wjsPlayer.wrapper.css({cursor: 'default'});
     });
-    
+
     /* Progress and Volume Bars */
-    wjs(newid).wrapper.find(".wcp-progress-bar").hover(function(arg1) {
+    wjse.wrapper.find(".wcp-progress-bar").hover(function(arg1) {
         return progressHoverIn.call(getContext(this),arg1);
     }, function(e) {
         if (!seekDrag) sel.call(this,".wcp-tooltip").hide(0);
     });
     
-    wjs(newid).wrapper.find(".wcp-progress-bar").bind("mousemove",function(arg1) {
+    wjse.wrapper.find(".wcp-progress-bar").bind("mousemove",function(arg1) {
         return progressMouseMoved.call(getContext(this),arg1);
     });
 
-    wjs(newid).wrapper.find(".wcp-progress-bar").bind("mousedown", function(e) {
+    wjse.wrapper.find(".wcp-progress-bar").bind("mousedown", function(e) {
         seekDrag = true;
         var rect = $(this).parents(".wcp-wrapper")[0].getBoundingClientRect();
         p = (e.pageX - rect.left) / $(this).width();
         sel.call(this,".wcp-progress-seen").css("width", (p*100)+"%");
     });
 
-    wjs(newid).wrapper.find(".wcp-vol-bar").bind("mousedown", function(e) {
+    wjse.wrapper.find(".wcp-vol-bar").bind("mousedown", function(e) {
         volDrag = true;
         var rect = sel.call(this,".wcp-vol-bar")[0].getBoundingClientRect();
         p = (e.pageX - rect.left) / $(this).width();
         getContext(this).volume(Math.floor(p*200)+5);
     });
 
-    wjs(newid).wrapper.find(".wcp-vol-button").hover(function() {
+    wjse.wrapper.find(".wcp-vol-button").hover(function() {
         $(sel.call(this,".wcp-vol-control")).animate({ width: 133 },200);
     },function() {
         if (!$($(sel.call(this,".wcp-vol-control")).selector + ":hover").length > 0 && !volDrag) {
@@ -410,28 +417,28 @@ wjs.prototype.addPlayer = function(wcpSettings) {
         }
     });
     
-    wjs(newid).wrapper.find('.wcp-vol-control').mouseout(function() {
+    wjse.wrapper.find('.wcp-vol-control').mouseout(function() {
         if (!$(sel.call(this,".wcp-vol-button").selector + ":hover").length > 0 && !$(sel.call(this,".wcp-vol-bar").selector + ":hover").length > 0 && !$(sel.call(this,".wcp-vol-control").selector + ":hover").length > 0 && !volDrag) {
             sel.call(this,".wcp-vol-control").animate({ width: 0 },200);
         }
     });
     
     // set initial status message font size
-    fontSize = calcFontSize(wjs(newid));
+    fontSize = calcFontSize(wjse);
 
-    wjs(newid).wrapper.find(".wcp-status").css('fontSize', fontSize);
-    wjs(newid).wrapper.find(".wcp-notif").css('fontSize', fontSize);
-    wjs(newid).wrapper.find(".wcp-subtitle-text").css('fontSize', fontSize);
+    wjse.wrapper.find(".wcp-status").css('fontSize', fontSize);
+    wjse.wrapper.find(".wcp-notif").css('fontSize', fontSize);
+    wjse.wrapper.find(".wcp-subtitle-text").css('fontSize', fontSize);
 
     // create player and attach event handlers
-    wjsPlayer = wjs(newid);
+    wjsPlayer = wjse;
     vlcs[newid].hideUI = setTimeout(function(i) { return function() { hideUI.call(players[i]); } }(newid),6000);
     vlcs[newid].timestampUI = 0;
     vlcs[newid].renderer = require("wcjs-renderer");
-    
+
     // set default network-caching to 10 seconds
     if (!wcpSettings["buffer"]) wcpSettings["buffer"] = 10000;
-    
+
     if (!wcpSettings["vlcArgs"]) wcpSettings["vlcArgs"] = ["--network-caching="+wcpSettings["buffer"]];
     else {
         var checkBuffer = wcpSettings["vlcArgs"].some(function(el,ij) {
@@ -440,8 +447,9 @@ wjs.prototype.addPlayer = function(wcpSettings) {
         if (!checkBuffer) wcpSettings["vlcArgs"].push("--network-caching="+wcpSettings["buffer"]);
     }
 
-    if (wcpSettings && wcpSettings["vlcArgs"]) vlcs[newid].vlc = vlcs[newid].renderer.init(wjs(newid).canvas,wcpSettings["vlcArgs"]);
-    else vlcs[newid].vlc = vlcs[newid].renderer.init(wjs(newid).canvas);
+    wjse.canvas = $('canvas', wjse.wrapper)[0]
+    if (wcpSettings && wcpSettings["vlcArgs"]) vlcs[newid].vlc = vlcs[newid].renderer.init(wjse.canvas,wcpSettings["vlcArgs"]);
+    else vlcs[newid].vlc = vlcs[newid].renderer.init(wjse.canvas);
     
     vlcs[newid].vlc.events.on("FrameSetup",function(i) {
         return function(width, height, pixelFormat, videoFrame) {
@@ -576,7 +584,7 @@ wjs.prototype.addPlayer = function(wcpSettings) {
     
     // set playlist mode to single playback, the player has it's own playlist mode feature
     vlcs[newid].vlc.playlist.mode = vlcs[newid].vlc.playlist.Single;
-    
+
     players[newid] = new wjs(newid);
 
     return players[newid];
@@ -1551,10 +1559,10 @@ function printPlaylist() {
                 plstring = plstring.split('  ').join(' ');
                 plstring = plstring.split('  ').join(' ');
                 plstring = plstring.split('  ').join(' ');
-                
+
                 // capitalize first letter
                 plstring = plstring.charAt(0).toUpperCase() + plstring.slice(1);
-    
+
                 if (plstring != this.itemDesc(oi).title) this.vlc.playlist.items[oi].title = "[custom]"+plstring;
             }
             generatePlaylist += '<li class="wcp-menu-item wcp-playlist-item';
@@ -1834,4 +1842,4 @@ wjs.prototype.onStateInt=function(wjsFunction){vlcs[this.context].events.on('Sta
 wjs.prototype.onTime=function(wjsFunction){this.catchEvent("TimeChanged",wjsFunction);return this}
 wjs.prototype.onPosition=function(wjsFunction){this.catchEvent("PositionChanged",wjsFunction);return this}
 wjs.prototype.onFrameSetup=function(wjsFunction){vlcs[this.context].events.on('FrameSetup',wjsFunction);return this}
-module.exports = wjs;
\ No newline at end of file
+module.exports = wjs;

From 7961e973b52dc86d1a58a7bdb2c8f90a102c7b32 Mon Sep 17 00:00:00 2001
From: Niv Sardi <xaiki@evilgiggle.com>
Date: Fri, 30 Oct 2015 11:54:21 -0300
Subject: [PATCH 4/8] allow for custom CSS

Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
---
 index.js | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/index.js b/index.js
index 297118d..f1cca63 100644
--- a/index.js
+++ b/index.js
@@ -31,20 +31,10 @@ var vlcs = {},
     path = require('path'),
     relbase = "./"+path.relative(path.dirname(require.main.filename), __dirname),
     sleepId;
-    
+
 require('jquery-ui/sortable');
 try{var powerSaveBlocker=require('remote').require('power-save-blocker')}catch(ex){var sleep=require('computer-sleep/sleep')}
 
-// inject css
-if (!$("link[href='"+relbase+"/css/general.css']").length) {
-    $('<link href="'+relbase+'/css/general.css" rel="stylesheet">').appendTo("head");
-    window.document.styleSheets[0].addRule('.wcp-menu-items::-webkit-scrollbar','width: 44px !important;');
-    window.document.styleSheets[0].addRule('.wcp-menu-items::-webkit-scrollbar-track','background-color: #696969 !important; border-right: 13px solid rgba(0, 0, 0, 0); border-left: 21px solid rgba(0, 0, 0, 0); background-clip: padding-box; -webkit-box-shadow: none !important;');
-    window.document.styleSheets[0].addRule('.wcp-menu-items::-webkit-scrollbar-thumb','background-color: #e5e5e5; border-right: 13px solid rgba(0, 0, 0, 0); border-left: 21px solid rgba(0, 0, 0, 0); background-clip: padding-box; -webkit-box-shadow: none !important;');
-    window.document.styleSheets[0].addRule('.wcp-menu-items::-webkit-scrollbar-thumb:hover','background-color: #e5e5e5 !important; border-right: 13px solid rgba(0, 0, 0, 0); border-left: 21px solid rgba(0, 0, 0, 0); background-clip: padding-box; -webkit-box-shadow: none !important;');
-    window.document.styleSheets[0].addRule('.wcp-menu-items::-webkit-scrollbar-thumb:active','background-color: #e5e5e5 !important; border-right: 13px solid rgba(0, 0, 0, 0); border-left: 21px solid rgba(0, 0, 0, 0); background-clip: padding-box; -webkit-box-shadow: none !important;');
-}
-
 // deinitializate when page changed
 window.onbeforeunload = function(e) {
     // stop all players
@@ -213,6 +203,17 @@ wjs.prototype.prev = function() {
 }
 
 wjs.prototype.addPlayer = function(wcpSettings) {
+    var cssFile = wcpSettings.css || relbase + '/css/general.css';
+    // inject css
+    if (!$("link[href='"+ cssFile +"']").length) {
+        $('<link href="'+ cssFile +'" rel="stylesheet">').appendTo("head");
+        window.document.styleSheets[0].addRule('.wcp-menu-items::-webkit-scrollbar','width: 44px !important;');
+        window.document.styleSheets[0].addRule('.wcp-menu-items::-webkit-scrollbar-track','background-color: #696969 !important; border-right: 13px solid rgba(0, 0, 0, 0); border-left: 21px solid rgba(0, 0, 0, 0); background-clip: padding-box; -webkit-box-shadow: none !important;');
+        window.document.styleSheets[0].addRule('.wcp-menu-items::-webkit-scrollbar-thumb','background-color: #e5e5e5; border-right: 13px solid rgba(0, 0, 0, 0); border-left: 21px solid rgba(0, 0, 0, 0); background-clip: padding-box; -webkit-box-shadow: none !important;');
+        window.document.styleSheets[0].addRule('.wcp-menu-items::-webkit-scrollbar-thumb:hover','background-color: #e5e5e5 !important; border-right: 13px solid rgba(0, 0, 0, 0); border-left: 21px solid rgba(0, 0, 0, 0); background-clip: padding-box; -webkit-box-shadow: none !important;');
+        window.document.styleSheets[0].addRule('.wcp-menu-items::-webkit-scrollbar-thumb:active','background-color: #e5e5e5 !important; border-right: 13px solid rgba(0, 0, 0, 0); border-left: 21px solid rgba(0, 0, 0, 0); background-clip: padding-box; -webkit-box-shadow: none !important;');
+    }
+
     var attach = wcpSettings.attach;
 
     if (attach) {

From c5bc05bb9140b8e96c609e0e91d0183e46f6502c Mon Sep 17 00:00:00 2001
From: Niv Sardi <xaiki@evilgiggle.com>
Date: Fri, 30 Oct 2015 12:38:42 -0300
Subject: [PATCH 5/8] hability to overload CSS

Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
---
 index.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/index.js b/index.js
index f1cca63..4d0c7d8 100644
--- a/index.js
+++ b/index.js
@@ -203,10 +203,11 @@ wjs.prototype.prev = function() {
 }
 
 wjs.prototype.addPlayer = function(wcpSettings) {
-    var cssFile = wcpSettings.css || relbase + '/css/general.css';
+    var wcjsCss = wcpSettings.css || relbase + '/css/general.css';
+    var customCss = wcpSettings.customCss;
     // inject css
-    if (!$("link[href='"+ cssFile +"']").length) {
-        $('<link href="'+ cssFile +'" rel="stylesheet">').appendTo("head");
+    if (!$("link[href='"+ wcjsCss +"']").length) {
+        $('<link href="'+ wcjsCss +'" rel="stylesheet">').appendTo("head");
         window.document.styleSheets[0].addRule('.wcp-menu-items::-webkit-scrollbar','width: 44px !important;');
         window.document.styleSheets[0].addRule('.wcp-menu-items::-webkit-scrollbar-track','background-color: #696969 !important; border-right: 13px solid rgba(0, 0, 0, 0); border-left: 21px solid rgba(0, 0, 0, 0); background-clip: padding-box; -webkit-box-shadow: none !important;');
         window.document.styleSheets[0].addRule('.wcp-menu-items::-webkit-scrollbar-thumb','background-color: #e5e5e5; border-right: 13px solid rgba(0, 0, 0, 0); border-left: 21px solid rgba(0, 0, 0, 0); background-clip: padding-box; -webkit-box-shadow: none !important;');
@@ -214,6 +215,10 @@ wjs.prototype.addPlayer = function(wcpSettings) {
         window.document.styleSheets[0].addRule('.wcp-menu-items::-webkit-scrollbar-thumb:active','background-color: #e5e5e5 !important; border-right: 13px solid rgba(0, 0, 0, 0); border-left: 21px solid rgba(0, 0, 0, 0); background-clip: padding-box; -webkit-box-shadow: none !important;');
     }
 
+    if (customCss && !$("link[href='"+ customCss +"']").length) {
+        $('<link href="'+ customCss +'" rel="stylesheet">').appendTo("head");
+    }
+
     var attach = wcpSettings.attach;
 
     if (attach) {

From 9ff30c91dcc1c024372e0d6707c65ce1f847a731 Mon Sep 17 00:00:00 2001
From: Niv Sardi <xaiki@evilgiggle.com>
Date: Fri, 30 Oct 2015 13:35:44 -0300
Subject: [PATCH 6/8] s/Css/CSS/

Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
---
 index.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/index.js b/index.js
index 4d0c7d8..403b7d1 100644
--- a/index.js
+++ b/index.js
@@ -203,11 +203,11 @@ wjs.prototype.prev = function() {
 }
 
 wjs.prototype.addPlayer = function(wcpSettings) {
-    var wcjsCss = wcpSettings.css || relbase + '/css/general.css';
-    var customCss = wcpSettings.customCss;
+    var wcjsCSS = wcpSettings.css || relbase + '/css/general.css';
+    var customCSS = wcpSettings.customCSS;
     // inject css
-    if (!$("link[href='"+ wcjsCss +"']").length) {
-        $('<link href="'+ wcjsCss +'" rel="stylesheet">').appendTo("head");
+    if (!$("link[href='"+ wcjsCSS +"']").length) {
+        $('<link href="'+ wcjsCSS +'" rel="stylesheet">').appendTo("head");
         window.document.styleSheets[0].addRule('.wcp-menu-items::-webkit-scrollbar','width: 44px !important;');
         window.document.styleSheets[0].addRule('.wcp-menu-items::-webkit-scrollbar-track','background-color: #696969 !important; border-right: 13px solid rgba(0, 0, 0, 0); border-left: 21px solid rgba(0, 0, 0, 0); background-clip: padding-box; -webkit-box-shadow: none !important;');
         window.document.styleSheets[0].addRule('.wcp-menu-items::-webkit-scrollbar-thumb','background-color: #e5e5e5; border-right: 13px solid rgba(0, 0, 0, 0); border-left: 21px solid rgba(0, 0, 0, 0); background-clip: padding-box; -webkit-box-shadow: none !important;');
@@ -215,8 +215,8 @@ wjs.prototype.addPlayer = function(wcpSettings) {
         window.document.styleSheets[0].addRule('.wcp-menu-items::-webkit-scrollbar-thumb:active','background-color: #e5e5e5 !important; border-right: 13px solid rgba(0, 0, 0, 0); border-left: 21px solid rgba(0, 0, 0, 0); background-clip: padding-box; -webkit-box-shadow: none !important;');
     }
 
-    if (customCss && !$("link[href='"+ customCss +"']").length) {
-        $('<link href="'+ customCss +'" rel="stylesheet">').appendTo("head");
+    if (customCSS && !$("link[href='"+ customCSS +"']").length) {
+        $('<link href="'+ customCSS +'" rel="stylesheet">').appendTo("head");
     }
 
     var attach = wcpSettings.attach;

From 2a9b5e1eb13a3c54e31d94cc97e1cc275449aeb5 Mon Sep 17 00:00:00 2001
From: Niv Sardi <xaiki@evilgiggle.com>
Date: Fri, 30 Oct 2015 16:41:41 -0300
Subject: [PATCH 7/8] check if wcpSettings exists

Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
---
 index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.js b/index.js
index 403b7d1..51247eb 100644
--- a/index.js
+++ b/index.js
@@ -219,7 +219,7 @@ wjs.prototype.addPlayer = function(wcpSettings) {
         $('<link href="'+ customCSS +'" rel="stylesheet">').appendTo("head");
     }
 
-    var attach = wcpSettings.attach;
+    var attach = wcpSettings && wcpSettings.attach;
 
     if (attach) {
         newid = attach;

From e8a1e68d096d64a535aefe543ce99bdd5395085a Mon Sep 17 00:00:00 2001
From: Niv Sardi <xaiki@evilgiggle.com>
Date: Fri, 30 Oct 2015 17:38:54 -0300
Subject: [PATCH 8/8] make jaruba happy,

oh and by the way we still can say whatever we want in the git commit messages yeah ? so i'll just say butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter butter

Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
---
 index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.js b/index.js
index 51247eb..a9b220c 100644
--- a/index.js
+++ b/index.js
@@ -219,10 +219,10 @@ wjs.prototype.addPlayer = function(wcpSettings) {
         $('<link href="'+ customCSS +'" rel="stylesheet">').appendTo("head");
     }
 
-    var attach = wcpSettings && wcpSettings.attach;
+    var attach = (!wcpSettings || typeof wcpSettings.attach === 'undefined') ? true : wcpSettings.attach;
 
     if (attach) {
-        newid = attach;
+        newid = wcpSettings.id || 'webchimera';
     } else {
         if (wcpSettings) newid = (typeof wcpSettings["id"] === "undefined") ? "webchimera" : wcpSettings["id"]; // if no id set, default to "webchimera"
         else newid = "webchimera";