From 6dd4c0551e4aa083000069e4edae8ee9eac47beb Mon Sep 17 00:00:00 2001 From: Jon Saine Date: Wed, 17 Aug 2011 09:45:37 -0500 Subject: [PATCH] Reverted hoverIntent version back to r5. It was breaking the menu. Forgot to upgrade plush.js for jquery 1.6.x compatibility. --- .../Plush/templates/static/javascripts/lib.js | 6 ++-- .../templates/static/javascripts/plush.js | 30 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/interfaces/Plush/templates/static/javascripts/lib.js b/interfaces/Plush/templates/static/javascripts/lib.js index da0d8d5ad6e..431f774dea2 100644 --- a/interfaces/Plush/templates/static/javascripts/lib.js +++ b/interfaces/Plush/templates/static/javascripts/lib.js @@ -330,14 +330,14 @@ eval(function(p,a,c,k,e,d){e=function(c){return(c * * @param f onMouseOver function || An object with configuration options * @param g onMouseOut function || Nothing (use configuration options object) -* @author Brian Cherne brian(at)cherne(dot)net +* @author Brian Cherne */ -(function($){$.fn.hoverIntent=function(f,g){var cfg={sensitivity:7,interval:100,timeout:0};cfg=$.extend(cfg,g?{over:f,out:g}:f);var cX,cY,pX,pY;var track=function(ev){cX=ev.pageX;cY=ev.pageY};var compare=function(ev,ob){ob.hoverIntent_t=clearTimeout(ob.hoverIntent_t);if((Math.abs(pX-cX)+Math.abs(pY-cY))35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('(6($){$.J.K=6(f,g){8 5={y:7,l:I,H:0};5=$.u(5,g?{v:f,z:g}:f);8 d,b,k,i;8 h=6(3){d=3.G;b=3.B};8 m=6(3,2){2.4=o(2.4);9((w.x(k-d)+w.x(i-b))<5.y){$(2).D("n",h);2.j=1;c 5.v.t(2,[3])}E{k=d;i=b;2.4=r(6(){m(3,2)},5.l)}};8 C=6(3,2){2.4=o(2.4);2.j=0;c 5.z.t(2,[3])};8 q=6(e){8 p=(e.A=="s"?e.N:e.U)||e.T;R(p&&p!=a){S{p=p.O}P(e){p=a}}9(p==a){c Q}8 3=F.u({},e);8 2=a;9(2.4){2.4=o(2.4)}9(e.A=="s"){k=3.G;i=3.B;$(2).M("n",h);9(2.j!=1){2.4=r(6(){m(3,2)},5.l)}}E{$(2).D("n",h);9(2.j==1){2.4=r(6(){C(3,2)},5.H)}}};c a.s(q).L(q)}})(F);',57,57,'||ob|ev|hoverIntent_t|cfg|function||var|if|this|cY|return|cX||||track|pY|hoverIntent_s|pX|interval|compare|mousemove|clearTimeout||handleHover|setTimeout|mouseover|apply|extend|over|Math|abs|sensitivity|out|type|pageY|delay|unbind|else|jQuery|pageX|timeout|100|fn|hoverIntent|mouseout|bind|fromElement|parentNode|catch|false|while|try|relatedTarget|toElement'.split('|'),0,{})) /*! Copyright (c) 2010 Brandon Aaron (http://brandonaaron.net) diff --git a/interfaces/Plush/templates/static/javascripts/plush.js b/interfaces/Plush/templates/static/javascripts/plush.js index 54dd75a17f3..33e0f418375 100644 --- a/interfaces/Plush/templates/static/javascripts/plush.js +++ b/interfaces/Plush/templates/static/javascripts/plush.js @@ -161,20 +161,20 @@ jQuery(function($){ }).trigger('change'); // Confirm Queue Deletions toggle - $("#confirmDeleteQueue").attr('checked', $.plush.confirmDeleteQueue ).change( function() { - $.plush.confirmDeleteQueue = $("#confirmDeleteQueue").attr('checked'); + $("#confirmDeleteQueue").prop('checked', $.plush.confirmDeleteQueue ).change( function() { + $.plush.confirmDeleteQueue = $("#confirmDeleteQueue").prop('checked'); $.cookie('plushConfirmDeleteQueue', $.plush.confirmDeleteQueue ? 1 : 0, { expires: 365, path: '/' }); }); // Confirm History Deletions toggle - $("#confirmDeleteHistory").attr('checked', $.plush.confirmDeleteHistory ).change( function() { - $.plush.confirmDeleteHistory = $("#confirmDeleteHistory").attr('checked'); + $("#confirmDeleteHistory").prop('checked', $.plush.confirmDeleteHistory ).change( function() { + $.plush.confirmDeleteHistory = $("#confirmDeleteHistory").prop('checked'); $.cookie('plushConfirmDeleteHistory', $.plush.confirmDeleteHistory ? 1 : 0, { expires: 365, path: '/' }); }); // Block Refreshes on Hover toggle - $("#blockRefresh").attr('checked', $.plush.blockRefresh ).change( function() { - $.plush.blockRefresh = $("#blockRefresh").attr('checked'); + $("#blockRefresh").prop('checked', $.plush.blockRefresh ).change( function() { + $.plush.blockRefresh = $("#blockRefresh").prop('checked'); $.cookie('plushBlockRefresh', $.plush.blockRefresh ? 1 : 0, { expires: 365, path: '/' }); }); @@ -690,22 +690,22 @@ $.plush.queueprevslots = $.plush.queuenoofslots; // for the next refresh // selections $("#multiops_select_all").click(function(){ - $("INPUT[type='checkbox']","#queueTable").attr('checked', true).trigger('change'); + $("INPUT[type='checkbox']","#queueTable").prop('checked', true).trigger('change'); }); var last1, last2; $("#multiops_select_range").click(function(){ if (last1 && last2 && last1 < last2) - $("INPUT[type='checkbox']","#queueTable").slice(last1,last2).attr('checked', true).trigger('change'); + $("INPUT[type='checkbox']","#queueTable").slice(last1,last2).prop('checked', true).trigger('change'); else if (last1 && last2) - $("INPUT[type='checkbox']","#queueTable").slice(last2,last1).attr('checked', true).trigger('change'); + $("INPUT[type='checkbox']","#queueTable").slice(last2,last1).prop('checked', true).trigger('change'); }); $("#multiops_select_invert").click(function(){ $("INPUT[type='checkbox']","#queueTable").each( function() { - $(this).attr('checked', !$(this).attr('checked')).trigger('change'); + $(this).prop('checked', !$(this).prop('checked')).trigger('change'); }); }); $("#multiops_select_none").click(function(){ - $("INPUT[type='checkbox']","#queueTable").attr('checked', false).trigger('change'); + $("INPUT[type='checkbox']","#queueTable").prop('checked', false).trigger('change'); }); $("#queue").delegate('.multiops','change',function(event) { // range event interaction @@ -713,7 +713,7 @@ $.plush.queueprevslots = $.plush.queuenoofslots; // for the next refresh last1 = $(event.target).parent()[0].rowIndex ? $(event.target).parent()[0].rowIndex : $(event.target).parent().parent()[0].rowIndex; // checkbox state persistence - if ($(this).attr('checked')) + if ($(this).prop('checked')) $.plush.multiOpsChecks[$(this).parent().parent().attr('id')] = true; else if ($.plush.multiOpsChecks[$(this).parent().parent().attr('id')]) delete $.plush.multiOpsChecks[$(this).parent().parent().attr('id')]; @@ -740,7 +740,7 @@ $("a","#multiops_inputs").click(function(e){ nzo_ids = nzo_ids.substr(1); if (!nzo_ids) return; - $(this).attr('disabled',true); + $(this).prop('disabled',true); if ($('#multi_status').val()) $.ajax({ @@ -777,7 +777,7 @@ $("a","#multiops_inputs").click(function(e){ data: {mode: 'change_script', value: nzo_ids, value2: $('#multi_script').val(), apikey: $.plush.apikey} }); - $(this).attr('disabled',false); + $(this).prop('disabled',false); $.plush.RefreshQueue(); }); @@ -1073,7 +1073,7 @@ $.plush.histprevslots = $.plush.histnoofslots; // for the next refresh $('').appendTo('#queue tr td.nzb_status_col'); if ($.plush.multiOpsChecks) // checkbox state persistence for (var nzo_id in $.plush.multiOpsChecks) - $('#'+nzo_id+' .multiops').attr('checked',true); + $('#'+nzo_id+' .multiops').prop('checked',true); $('#queue-pagination span').removeClass('loading'); // Remove spinner graphic from pagination