From 0d061140a18e177c511c76a377d06907d7e1a101 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 13 Jul 2013 18:20:11 +0200 Subject: Create spin.js --- js/spin.js | 349 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 349 insertions(+) create mode 100644 js/spin.js (limited to 'js') diff --git a/js/spin.js b/js/spin.js new file mode 100644 index 000000000..c66c607a7 --- /dev/null +++ b/js/spin.js @@ -0,0 +1,349 @@ +//fgnass.github.com/spin.js#v1.3 + +/** + * Copyright (c) 2011-2013 Felix Gnass + * Licensed under the MIT license + */ +(function(root, factory) { + + /* CommonJS */ + if (typeof exports == 'object') module.exports = factory() + + /* AMD module */ + else if (typeof define == 'function' && define.amd) define(factory) + + /* Browser global */ + else root.Spinner = factory() +} +(this, function() { + "use strict"; + + var prefixes = ['webkit', 'Moz', 'ms', 'O'] /* Vendor prefixes */ + , animations = {} /* Animation rules keyed by their name */ + , useCssAnimations /* Whether to use CSS animations or setTimeout */ + + /** + * Utility function to create elements. If no tag name is given, + * a DIV is created. Optionally properties can be passed. + */ + function createEl(tag, prop) { + var el = document.createElement(tag || 'div') + , n + + for(n in prop) el[n] = prop[n] + return el + } + + /** + * Appends children and returns the parent. + */ + function ins(parent /* child1, child2, ...*/) { + for (var i=1, n=arguments.length; i> 1) : parseInt(o.left, 10) + mid) + 'px', + top: (o.top == 'auto' ? tp.y-ep.y + (target.offsetHeight >> 1) : parseInt(o.top, 10) + mid) + 'px' + }) + } + + el.setAttribute('role', 'progressbar') + self.lines(el, self.opts) + + if (!useCssAnimations) { + // No CSS animation support, use setTimeout() instead + var i = 0 + , start = (o.lines - 1) * (1 - o.direction) / 2 + , alpha + , fps = o.fps + , f = fps/o.speed + , ostep = (1-o.opacity) / (f*o.trail / 100) + , astep = f/o.lines + + ;(function anim() { + i++; + for (var j = 0; j < o.lines; j++) { + alpha = Math.max(1 - (i + (o.lines - j) * astep) % f * ostep, o.opacity) + + self.opacity(el, j * o.direction + start, alpha, o) + } + self.timeout = self.el && setTimeout(anim, ~~(1000/fps)) + })() + } + return self + }, + + /** + * Stops and removes the Spinner. + */ + stop: function() { + var el = this.el + if (el) { + clearTimeout(this.timeout) + if (el.parentNode) el.parentNode.removeChild(el) + this.el = undefined + } + return this + }, + + /** + * Internal method that draws the individual lines. Will be overwritten + * in VML fallback mode below. + */ + lines: function(el, o) { + var i = 0 + , start = (o.lines - 1) * (1 - o.direction) / 2 + , seg + + function fill(color, shadow) { + return css(createEl(), { + position: 'absolute', + width: (o.length+o.width) + 'px', + height: o.width + 'px', + background: color, + boxShadow: shadow, + transformOrigin: 'left', + transform: 'rotate(' + ~~(360/o.lines*i+o.rotate) + 'deg) translate(' + o.radius+'px' +',0)', + borderRadius: (o.corners * o.width>>1) + 'px' + }) + } + + for (; i < o.lines; i++) { + seg = css(createEl(), { + position: 'absolute', + top: 1+~(o.width/2) + 'px', + transform: o.hwaccel ? 'translate3d(0,0,0)' : '', + opacity: o.opacity, + animation: useCssAnimations && addAnimation(o.opacity, o.trail, start + i * o.direction, o.lines) + ' ' + 1/o.speed + 's linear infinite' + }) + + if (o.shadow) ins(seg, css(fill('#000', '0 0 4px ' + '#000'), {top: 2+'px'})) + + ins(el, ins(seg, fill(o.color, '0 0 1px rgba(0,0,0,.1)'))) + } + return el + }, + + /** + * Internal method that adjusts the opacity of a single line. + * Will be overwritten in VML fallback mode below. + */ + opacity: function(el, i, val) { + if (i < el.childNodes.length) el.childNodes[i].style.opacity = val + } + + }) + + + function initVML() { + + /* Utility function to create a VML tag */ + function vml(tag, attr) { + return createEl('<' + tag + ' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">', attr) + } + + // No CSS transforms but VML support, add a CSS rule for VML elements: + sheet.addRule('.spin-vml', 'behavior:url(#default#VML)') + + Spinner.prototype.lines = function(el, o) { + var r = o.length+o.width + , s = 2*r + + function grp() { + return css( + vml('group', { + coordsize: s + ' ' + s, + coordorigin: -r + ' ' + -r + }), + { width: s, height: s } + ) + } + + var margin = -(o.width+o.length)*2 + 'px' + , g = css(grp(), {position: 'absolute', top: margin, left: margin}) + , i + + function seg(i, dx, filter) { + ins(g, + ins(css(grp(), {rotation: 360 / o.lines * i + 'deg', left: ~~dx}), + ins(css(vml('roundrect', {arcsize: o.corners}), { + width: r, + height: o.width, + left: o.radius, + top: -o.width>>1, + filter: filter + }), + vml('fill', {color: o.color, opacity: o.opacity}), + vml('stroke', {opacity: 0}) // transparent stroke to fix color bleeding upon opacity change + ) + ) + ) + } + + if (o.shadow) + for (i = 1; i <= o.lines; i++) + seg(i, -2, 'progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)') + + for (i = 1; i <= o.lines; i++) seg(i) + return ins(el, g) + } + + Spinner.prototype.opacity = function(el, i, val, o) { + var c = el.firstChild + o = o.shadow && o.lines || 0 + if (c && i+o < c.childNodes.length) { + c = c.childNodes[i+o]; c = c && c.firstChild; c = c && c.firstChild + if (c) c.opacity = val + } + } + } + + var probe = css(createEl('group'), {behavior: 'url(#default#VML)'}) + + if (!vendor(probe, 'transform') && probe.adj) initVML() + else useCssAnimations = vendor(probe, 'animation') + + return Spinner + +})); -- cgit v1.2.3 From 21e013ab05c60a07bb1e79843598eb799f41fa05 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 13 Jul 2013 18:22:14 +0200 Subject: Create jquery.spin.js jquery plugin for spin.js --- js/jquery.spin.js | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 js/jquery.spin.js (limited to 'js') diff --git a/js/jquery.spin.js b/js/jquery.spin.js new file mode 100644 index 000000000..a35a27765 --- /dev/null +++ b/js/jquery.spin.js @@ -0,0 +1,80 @@ +/** + * Copyright (c) 2011-2013 Felix Gnass + * Licensed under the MIT license + */ + +/* + +Basic Usage: +============ + +$('#el').spin(); // Creates a default Spinner using the text color of #el. +$('#el').spin({ ... }); // Creates a Spinner using the provided options. + +$('#el').spin(false); // Stops and removes the spinner. + +Using Presets: +============== + +$('#el').spin('small'); // Creates a 'small' Spinner using the text color of #el. +$('#el').spin('large', '#fff'); // Creates a 'large' white Spinner. + +Adding a custom preset: +======================= + +$.fn.spin.presets.flower = { + lines: 9 + length: 10 + width: 20 + radius: 0 +} + +$('#el').spin('flower', 'red'); + +*/ + +(function(factory) { + + if (typeof exports == 'object') { + // CommonJS + factory(require('jquery'), require('spin')) + } + else if (typeof define == 'function' && define.amd) { + // AMD, register as anonymous module + define(['jquery', 'spin'], factory) + } + else { + // Browser globals + if (!window.Spinner) throw new Error('Spin.js not present') + factory(window.jQuery, window.Spinner) + } + +}(function($, Spinner) { + + $.fn.spin = function(opts, color) { + + return this.each(function() { + var $this = $(this), + data = $this.data(); + + if (data.spinner) { + data.spinner.stop(); + delete data.spinner; + } + if (opts !== false) { + opts = $.extend( + { color: color || $this.css('color') }, + $.fn.spin.presets[opts] || opts + ) + data.spinner = new Spinner(opts).spin(this) + } + }) + } + + $.fn.spin.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 } + } + +})); -- cgit v1.2.3 From 486041ebbce26bc6a2540e2d93b938ea0e35e9bb Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 13 Jul 2013 20:03:42 +0200 Subject: Update main.js --- js/main.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'js') diff --git a/js/main.js b/js/main.js index f1a50e28a..3f165dfa3 100644 --- a/js/main.js +++ b/js/main.js @@ -1,4 +1,3 @@ - function confirmDelete() { return confirm(aStr['delitem']); } function commentOpen(obj,id) { if(obj.value == aStr['comment']) { @@ -509,7 +508,7 @@ function updateConvItems(mode,data) { } if(page_load) - $("#page-spinner").show(); + $("#page-spinner").spin('small'); $.get(update_url,function(data) { var update_mode = ((page_load) ? 'replace' : 'update'); @@ -519,7 +518,7 @@ function updateConvItems(mode,data) { scroll_next = false; in_progress = false; updateConvItems(update_mode,data); - $("#page-spinner").hide(); + $("#page-spinner").spin(false); $("#profile-jot-text-loading").hide(); }); -- cgit v1.2.3 From 7f3c44a43171c7acd06fe0417923f51802b50e6c Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 13 Jul 2013 20:07:37 +0200 Subject: Update main.js --- js/main.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'js') diff --git a/js/main.js b/js/main.js index 3f165dfa3..3dc9d4814 100644 --- a/js/main.js +++ b/js/main.js @@ -1,4 +1,5 @@ - function confirmDelete() { return confirm(aStr['delitem']); } + +function confirmDelete() { return confirm(aStr['delitem']); } function commentOpen(obj,id) { if(obj.value == aStr['comment']) { obj.value = ''; -- cgit v1.2.3 From 1d5fe559738dca70650e969b8630f905190b535e Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 13 Jul 2013 20:11:21 +0200 Subject: Update main.js --- js/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/main.js b/js/main.js index 3dc9d4814..6a45c8f37 100644 --- a/js/main.js +++ b/js/main.js @@ -1,5 +1,5 @@ -function confirmDelete() { return confirm(aStr['delitem']); } + function confirmDelete() { return confirm(aStr['delitem']); } function commentOpen(obj,id) { if(obj.value == aStr['comment']) { obj.value = ''; -- cgit v1.2.3 From 272642966b3019cb09961f47de7b91c29e98f2b7 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 13 Jul 2013 21:37:39 +0200 Subject: port like button to spin.js --- js/main.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'js') diff --git a/js/main.js b/js/main.js index 6a45c8f37..170062264 100644 --- a/js/main.js +++ b/js/main.js @@ -252,7 +252,7 @@ function NavUpdate() { if(liking) - $('.like-rotator').hide(); + $('.like-rotator').spin(false); if(! stopped) { @@ -423,7 +423,7 @@ function updateConvItems(mode,data) { }); } - $('.like-rotator').hide(); + $('.like-rotator').spin(false); if(commentBusy) { commentBusy = false; @@ -475,7 +475,7 @@ function updateConvItems(mode,data) { function liveUpdate() { - if((src == null) || (stopped) || (! profile_uid)) { $('.like-rotator').hide(); return; } + if((src == null) || (stopped) || (! profile_uid)) { $('.like-rotator').spin(false); return; } if(($('.comment-edit-text-full').length) || (in_progress)) { if(livetime) { clearTimeout(livetime); @@ -586,14 +586,14 @@ function updateConvItems(mode,data) { function dolike(ident,verb) { unpause(); - $('#like-rotator-' + ident.toString()).show(); + $('#like-rotator-' + ident.toString()).spin('tiny'); $.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate ); liking = 1; } function dosubthread(ident) { unpause(); - $('#like-rotator-' + ident.toString()).show(); + $('#like-rotator-' + ident.toString()).spin('tiny'); $.get('subthread/' + ident.toString(), NavUpdate ); liking = 1; } @@ -601,7 +601,7 @@ function updateConvItems(mode,data) { function dostar(ident) { ident = ident.toString(); - $('#like-rotator-' + ident).show(); + $('#like-rotator-' + ident).spin('tiny'); $.get('starred/' + ident, function(data) { if(data.result == 1) { $('#starred-' + ident).addClass('starred'); @@ -615,7 +615,7 @@ function updateConvItems(mode,data) { $('#star-' + ident).removeClass('hidden'); $('#unstar-' + ident).addClass('hidden'); } - $('#like-rotator-' + ident).hide(); + $('#like-rotator-' + ident).spin(false); }); } -- cgit v1.2.3 From 9cb151fe27463f6154e61f1cc01d13bd49ab6017 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Sat, 13 Jul 2013 23:28:44 +0200 Subject: port jot to spin.js --- js/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/main.js b/js/main.js index 170062264..4938c6acd 100644 --- a/js/main.js +++ b/js/main.js @@ -520,7 +520,7 @@ function updateConvItems(mode,data) { in_progress = false; updateConvItems(update_mode,data); $("#page-spinner").spin(false); - $("#profile-jot-text-loading").hide(); + $("#profile-jot-text-loading").spin(false); }); -- cgit v1.2.3