From 628af050bc99c362064063390c48c4a63696310d Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
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<i;e++)t.appendChild(arguments[e]);return t}var f=function(){var t=a("style",{type:"text/css"});s(e.getElementsByTagName("head")[0],t);return t.sheet||t.styleSheet}();function l(t,e,i,o){var a=["opacity",e,~~(t*100),i,o].join("-"),s=.01+i/o*100,l=Math.max(1-(1-t)/e*(100-s),t),p=n.substring(0,n.indexOf("Animation")).toLowerCase(),u=p&&"-"+p+"-"||"";if(!r[a]){f.insertRule("@"+u+"keyframes "+a+"{"+"0%{opacity:"+l+"}"+s+"%{opacity:"+t+"}"+(s+.01)+"%{opacity:1}"+(s+e)%100+"%{opacity:"+t+"}"+"100%{opacity:"+l+"}"+"}",f.cssRules.length);r[a]=1}return a}function p(t,e){var r=t.style,n,a;if(r[e]!==i)return e;e=e.charAt(0).toUpperCase()+e.slice(1);for(a=0;a<o.length;a++){n=o[a]+e;if(r[n]!==i)return n}}function u(t,e){for(var i in e)t.style[p(t,i)||i]=e[i];return t}function c(t){for(var e=1;e<arguments.length;e++){var o=arguments[e];for(var r in o)if(t[r]===i)t[r]=o[r]}return t}function d(t){var e={x:t.offsetLeft,y:t.offsetTop};while(t=t.offsetParent)e.x+=t.offsetLeft,e.y+=t.offsetTop;return e}var h={lines:12,length:7,width:5,radius:10,rotate:0,corners:1,color:"#000",speed:1,trail:100,opacity:1/4,fps:20,zIndex:2e9,className:"spinner",top:"auto",left:"auto",position:"relative"};function m(t){if(!this.spin)return new m(t);this.opts=c(t||{},m.defaults,h)}m.defaults={};c(m.prototype,{spin:function(t){this.stop();var e=this,i=e.opts,o=e.el=u(a(0,{className:i.className}),{position:i.position,width:0,zIndex:i.zIndex}),r=i.radius+i.length+i.width,s,f;if(t){t.insertBefore(o,t.firstChild||null);f=d(t);s=d(o);u(o,{left:(i.left=="auto"?f.x-s.x+(t.offsetWidth>>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.lines;i++){o=u(a(),{position:"absolute",top:1+~(e.width/2)+"px",transform:e.hwaccel?"translate3d(0,0,0)":"",opacity:e.opacity,animation:n&&l(e.opacity,e.trail,i,e.lines)+" "+1/e.speed+"s linear infinite"});if(e.shadow)s(o,u(r("#000","0 0 4px "+"#000"),{top:2+"px"}));s(t,s(o,r(e.color,"0 0 1px rgba(0,0,0,.1)")))}return t},opacity:function(t,e,i){if(e<t.childNodes.length)t.childNodes[e].style.opacity=i}});(function(){function t(t,e){return a("<"+t+' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">',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<r.childNodes.length){r=r.childNodes[e+o];r=r&&r.firstChild;r=r&&r.firstChild;if(r)r.opacity=i}}}else n=p(e,"animation")})();if(typeof define=="function"&&define.amd)define(function(){return m});else t.Spinner=m}(window,document);// https://gist.github.com/its-florida/1290439/raw/ce7face0309bdb265244e8483ce91dcf86e8cb14/jquery.spin.js
-/*
-
-You can now create a spinner using any of the variants below:
-
-$("#el").spin(); // Produces default Spinner using the text color of #el.
-$("#el").spin("small"); // Produces a 'small' Spinner using the text color of #el.
-$("#el").spin("large", "white"); // Produces a 'large' Spinner in white (or any valid CSS color).
-$("#el").spin({ ... }); // Produces a Spinner using your custom settings.
-
-$("#el").spin(false); // Kills the spinner.
-
-*/
-(function($) {
- $.fn.spin = function(opts, color) {
- var presets = {
- "tiny": { lines: 8, length: 2, width: 2, radius: 3 },
- "small": { lines: 8, length: 4, width: 3, radius: 5 },
- "large": { lines: 10, length: 8, width: 4, radius: 8 }
- };
- if (Spinner) {
- return this.each(function() {
- var $this = $(this),
- data = $this.data();
-
- if (data.spinner) {
- data.spinner.stop();
- delete data.spinner;
- }
- if (opts !== false) {
- if (typeof opts === "string") {
- if (opts in presets) {
- opts = presets[opts];
- } else {
- opts = {};
- }
- if (color) {
- opts.color = color;
- }
- }
- data.spinner = new Spinner($.extend({color: $this.css('color')}, opts)).spin(this);
- }
- });
- } else {
- throw "Spinner class not available.";
- }
- };
-})(jQuery);
-var spin_presets={
- lines: 13, // The number of lines to draw
- length: 7, // The length of each line
- width: 4, // The line thickness
- radius: 10, // The radius of the inner circle
- corners: 1, // Corner roundness (0..1)
- rotate: 0, // The rotation offset
- color: '#306', // #rgb or #rrggbb
- speed: 1, // Rounds per second
- trail: 60, // Afterglow percentage
- shadow: false, // Whether to render a shadow
- hwaccel: true, // Whether to use hardware acceleration
- className: 'spinner', // The CSS class to assign to the spinner
- zIndex: 2e9, // The z-index (defaults to 2000000000)
- top: 'auto', // Top position relative to parent in px
- left: 'auto' // Left position relative to parent in px
-};
diff --git a/third-party/spin/spin.all.js b/third-party/spin/spin.all.js
deleted file mode 120000
index a47d62cd..00000000
--- a/third-party/spin/spin.all.js
+++ /dev/null
@@ -1 +0,0 @@
-../spin-1.2.8/spin.all.js
\ No newline at end of file
--
2.47.0