From 628af050bc99c362064063390c48c4a63696310d Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 14 Mar 2013 12:08:51 +0100 Subject: [PATCH] get rid of the spin.all.js exception - it's already complex enough --- plugins/querycode.py | 4 +- plugins/simplelist.py | 5 ++- third-party/spin-1.2.8/Makefile | 6 --- third-party/spin-1.2.8/spin.all.js | 65 ------------------------------ third-party/spin/spin.all.js | 1 - 5 files changed, 6 insertions(+), 75 deletions(-) delete mode 100644 third-party/spin-1.2.8/Makefile delete mode 100644 third-party/spin-1.2.8/spin.all.js delete mode 120000 third-party/spin/spin.all.js diff --git a/plugins/querycode.py b/plugins/querycode.py index 637c66b0..fc5c163f 100644 --- a/plugins/querycode.py +++ b/plugins/querycode.py @@ -14,7 +14,9 @@ class QueryCode (Plugin): def requirements (self): return { 'js_files' : [ "js/querycode.js", "js/plugin.js", "js/query.js", "js/onavail.js", - "js/manifold-pubsub.js", "js/manifold-async.js", "spin/spin.all.js", + "js/manifold-pubsub.js", "js/manifold-async.js", + "js/spin.presets.js", "js/spin.min.js", "js/jquery.spin.js", + # Plugins::add_js('/QueryCode/beautyofcode/scripts/shCore.js'); # Plugins::add_js('/QueryCode/beautyofcode/scripts/shBrushPython.js'); # Plugins::add_js('/QueryCode/beautyofcode/scripts/shBrushRuby.js'); diff --git a/plugins/simplelist.py b/plugins/simplelist.py index a9ae38d0..a86d73c2 100644 --- a/plugins/simplelist.py +++ b/plugins/simplelist.py @@ -21,8 +21,9 @@ class SimpleList (Plugin) : def requirements (self): reqs = { 'js_files' : [ "js/simplelist.js", "js/plugin.js", "js/query.js", "js/onavail.js", - "js/manifold-pubsub.js", "js/manifold-async.js", "spin/spin.all.js", -] , + "js/manifold-pubsub.js", "js/manifold-async.js", + "js/spin.presets.js", "js/spin.min.js", "js/jquery.spin.js", + ] , 'css_files': [ "css/simplelist.css" ], } if self.with_datatables: diff --git a/third-party/spin-1.2.8/Makefile b/third-party/spin-1.2.8/Makefile deleted file mode 100644 index 667a694a..00000000 --- a/third-party/spin-1.2.8/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# we need 3 pieces -# spin.min.js - core - see URL -# jquery.min.js - the jqeury plugin - see URL -# spin.presets.js - our own settings defined as spin_presets -all: - cat spin.min.js jquery.spin.js spin.presets.js > spin.all.js diff --git a/third-party/spin-1.2.8/spin.all.js b/third-party/spin-1.2.8/spin.all.js deleted file mode 100644 index 452bb862..00000000 --- a/third-party/spin-1.2.8/spin.all.js +++ /dev/null @@ -1,65 +0,0 @@ -!function(t,e,i){var o=["webkit","Moz","ms","O"],r={},n;function a(t,i){var o=e.createElement(t||"div"),r;for(r in i)o[r]=i[r];return o}function s(t){for(var e=1,i=arguments.length;e>1):parseInt(i.left,10)+r)+"px",top:(i.top=="auto"?f.y-s.y+(t.offsetHeight>>1):parseInt(i.top,10)+r)+"px"})}o.setAttribute("aria-role","progressbar");e.lines(o,e.opts);if(!n){var l=0,p=i.fps,c=p/i.speed,h=(1-i.opacity)/(c*i.trail/100),m=c/i.lines;(function y(){l++;for(var t=i.lines;t;t--){var r=Math.max(1-(l+t*m)%c*h,i.opacity);e.opacity(o,i.lines-t,r,i)}e.timeout=e.el&&setTimeout(y,~~(1e3/p))})()}return e},stop:function(){var t=this.el;if(t){clearTimeout(this.timeout);if(t.parentNode)t.parentNode.removeChild(t);this.el=i}return this},lines:function(t,e){var i=0,o;function r(t,o){return u(a(),{position:"absolute",width:e.length+e.width+"px",height:e.width+"px",background:t,boxShadow:o,transformOrigin:"left",transform:"rotate("+~~(360/e.lines*i+e.rotate)+"deg) translate("+e.radius+"px"+",0)",borderRadius:(e.corners*e.width>>1)+"px"})}for(;i',e)}var e=u(a("group"),{behavior:"url(#default#VML)"});if(!p(e,"transform")&&e.adj){f.addRule(".spin-vml","behavior:url(#default#VML)");m.prototype.lines=function(e,i){var o=i.length+i.width,r=2*o;function n(){return u(t("group",{coordsize:r+" "+r,coordorigin:-o+" "+-o}),{width:r,height:r})}var a=-(i.width+i.length)*2+"px",f=u(n(),{position:"absolute",top:a,left:a}),l;function p(e,r,a){s(f,s(u(n(),{rotation:360/i.lines*e+"deg",left:~~r}),s(u(t("roundrect",{arcsize:i.corners}),{width:o,height:i.width,left:i.radius,top:-i.width>>1,filter:a}),t("fill",{color:i.color,opacity:i.opacity}),t("stroke",{opacity:0}))))}if(i.shadow)for(l=1;l<=i.lines;l++)p(l,-2,"progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)");for(l=1;l<=i.lines;l++)p(l);return s(e,f)};m.prototype.opacity=function(t,e,i,o){var r=t.firstChild;o=o.shadow&&o.lines||0;if(r&&e+o