aboutsummaryrefslogtreecommitdiffstats
path: root/view/js
diff options
context:
space:
mode:
Diffstat (limited to 'view/js')
-rw-r--r--view/js/autocomplete.js6
-rw-r--r--view/js/jquery.spin.js79
-rw-r--r--view/js/main.js34
-rw-r--r--view/js/spin.js377
4 files changed, 20 insertions, 476 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 1a507a28c..08cf97173 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -5,7 +5,7 @@
*/
function contact_search(term, callback, backend_url, type, extra_channels, spinelement) {
if(spinelement) {
- $(spinelement).spin('tiny');
+ $(spinelement).show();
}
// Check if there is a cached result that contains the same information we would get with a full server-side search
var bt = backend_url+type;
@@ -14,7 +14,7 @@ function contact_search(term, callback, backend_url, type, extra_channels, spine
var lterm = term.toLowerCase(); // Ignore case
for(var t in contact_search.cache[bt]) {
if(lterm.indexOf(t) >= 0) { // A more broad search has been performed already, so use those results
- $(spinelement).spin(false);
+ $(spinelement).hide();
// Filter old results locally
var matching = contact_search.cache[bt][t].filter(function (x) { return (x.name.toLowerCase().indexOf(lterm) >= 0 || (typeof x.nick !== 'undefined' && x.nick.toLowerCase().indexOf(lterm) >= 0)); }); // Need to check that nick exists because groups don't have one
matching.unshift({taggable:false, text: term, replace: term});
@@ -47,7 +47,7 @@ function contact_search(term, callback, backend_url, type, extra_channels, spine
var items = data.items.slice(0);
items.unshift({taggable:false, text: term, replace: term});
callback(items);
- $(spinelement).spin(false);
+ $(spinelement).hide();
},
}).fail(function () {callback([]); }); // Callback must be invoked even if something went wrong.
}
diff --git a/view/js/jquery.spin.js b/view/js/jquery.spin.js
deleted file mode 100644
index 6b4fd656f..000000000
--- a/view/js/jquery.spin.js
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Copyright (c) 2011-2014 Felix Gnass
- * Licensed under the MIT license
- * http://spin.js.org/
- */
-
-/*
-
-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.js'))
- } 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, position: 'relative' }
- , small: { lines: 8, length: 4, width: 3, radius: 5, position: 'relative' }
- , large: { lines: 10, length: 8, width: 4, radius: 8, position: 'relative' }
- }
-
-}));
diff --git a/view/js/main.js b/view/js/main.js
index 919eb282a..1634eef1b 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -414,7 +414,7 @@ $(function() {
function NavUpdate() {
if(liking)
- $('.like-rotator').spin(false);
+ $('.like-rotator').hide();
if((! stopped) && (! mediaPlaying)) {
var pingCmd = 'ping' + ((localUser != 0) ? '?f=&uid=' + localUser : '');
@@ -657,7 +657,7 @@ function updateConvItems(mode,data) {
// reset rotators and cursors we may have set before reaching this place
- $('.like-rotator').spin(false);
+ $('.like-rotator').hide();
if(commentBusy) {
commentBusy = false;
@@ -781,7 +781,7 @@ function collapseHeight() {
function liveUpdate() {
if(typeof profile_uid === 'undefined') profile_uid = false; /* Should probably be unified with channelId defined in head.tpl */
- if((src === null) || (stopped) || (! profile_uid)) { $('.like-rotator').spin(false); return; }
+ if((src === null) || (stopped) || (! profile_uid)) { $('.like-rotator').hide(); return; }
if(($('.comment-edit-text.expanded').length) || (in_progress)) {
if(livetime) {
clearTimeout(livetime);
@@ -810,7 +810,7 @@ function liveUpdate() {
update_url = buildCmd();
if(page_load) {
- $("#page-spinner").spin('small');
+ $("#page-spinner").show();
if(bParam_page == 1)
update_mode = 'replace';
else
@@ -859,8 +859,8 @@ function liveUpdate() {
page_load = false;
scroll_next = false;
updateConvItems(update_mode,data);
- $("#page-spinner").spin(false);
- $("#profile-jot-text-loading").spin(false);
+ $("#page-spinner").hide();
+ $("#profile-jot-text-loading").hide();
// adjust scroll position if new content was added above viewport
if(update_mode === 'update') {
@@ -889,8 +889,8 @@ function liveUpdate() {
page_load = false;
scroll_next = false;
updateConvItems(update_mode,data);
- $("#page-spinner").spin(false);
- $("#profile-jot-text-loading").spin(false);
+ $("#page-spinner").hide();
+ $("#profile-jot-text-loading").hide();
in_progress = false;
@@ -930,14 +930,14 @@ function pageUpdate() {
update_url = baseurl + '/' + page_query + '/?f=&aj=1&page=' + bParam_page + extra_args ;
- $("#page-spinner").spin('small');
+ $("#page-spinner").show();
update_mode = 'append';
$.get(update_url,function(data) {
page_load = false;
scroll_next = false;
updatePageItems(update_mode,data);
- $("#page-spinner").spin(false);
+ $("#page-spinner").hide();
$(".autotime").timeago();
in_progress = false;
});
@@ -1014,7 +1014,7 @@ function notify_popup_loader(notifyType) {
function dolike(ident, verb) {
unpause();
- $('#like-rotator-' + ident.toString()).spin('tiny');
+ $('#like-rotator-' + ident.toString()).show();
$.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate );
liking = 1;
}
@@ -1044,7 +1044,7 @@ function dropItem(url, object) {
function dosubthread(ident) {
unpause();
- $('#like-rotator-' + ident.toString()).spin('tiny');
+ $('#like-rotator-' + ident.toString()).show();
$.get('subthread/sub/' + ident.toString(), NavUpdate );
liking = 1;
}
@@ -1052,7 +1052,7 @@ function dosubthread(ident) {
function dounsubthread(ident) {
unpause();
- $('#like-rotator-' + ident.toString()).spin('tiny');
+ $('#like-rotator-' + ident.toString()).show();
$.get('subthread/unsub/' + ident.toString(), NavUpdate );
liking = 1;
}
@@ -1061,7 +1061,7 @@ function dounsubthread(ident) {
function dostar(ident) {
ident = ident.toString();
- $('#like-rotator-' + ident).spin('tiny');
+ $('#like-rotator-' + ident).show();
$.get('starred/' + ident, function(data) {
if(data.result == 1) {
$('#starred-' + ident).addClass('starred');
@@ -1079,7 +1079,7 @@ function dostar(ident) {
$('#star-' + ident).removeClass('hidden');
$('#unstar-' + ident).addClass('hidden');
}
- $('#like-rotator-' + ident).spin(false);
+ $('#like-rotator-' + ident).hide();
});
}
@@ -1113,11 +1113,11 @@ function lockview(type, id) {
function filestorage(event, nick, id) {
$('#cloud-index-' + last_filestorage_id).removeClass('cloud-index-active');
$('#perms-panel-' + last_filestorage_id).hide().html('');
- $('#file-edit-' + id).spin('tiny');
+ $('#file-edit-' + id).show();
$.get('filestorage/' + nick + '/' + id + '/edit', function(data) {
$('#cloud-index-' + id).addClass('cloud-index-active');
$('#perms-panel-' + id).html(data).show();
- $('#file-edit-' + id).spin(false);
+ $('#file-edit-' + id).hide();
last_filestorage_id = id;
});
}
diff --git a/view/js/spin.js b/view/js/spin.js
deleted file mode 100644
index 145ce1baf..000000000
--- a/view/js/spin.js
+++ /dev/null
@@ -1,377 +0,0 @@
-/**
- * Copyright (c) 2011-2014 Felix Gnass
- * Licensed under the MIT license
- * http://spin.js.org/
- *
- * Example:
- var opts = {
- lines: 12, // The number of lines to draw
- , length: 7, // The length of each line
- , width: 5, // The line thickness
- , radius: 10 // The radius of the inner circle
- , scale: 1.0 // Scales overall size of the spinner
- , corners: 1 // Roundness (0..1)
- , color: '#000' // #rgb or #rrggbb
- , opacity: 1/4 // Opacity of the lines
- , rotate: 0 // Rotation offset
- , direction: 1 // 1: clockwise, -1: counterclockwise
- , speed: 1 // Rounds per second
- , trail: 100 // Afterglow percentage
- , fps: 20 // Frames per second when using setTimeout()
- , zIndex: 2e9 // Use a high z-index by default
- , className: 'spinner' // CSS class to assign to the element
- , top: '50%' // center vertically
- , left: '50%' // center horizontally
- , shadow: false // Whether to render a shadow
- , hwaccel: false // Whether to use hardware acceleration (might be buggy)
- , position: 'absolute' // Element positioning
- }
- var target = document.getElementById('foo')
- var spinner = new Spinner(opts).spin(target)
- */
-;(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 */
- , sheet /* A stylesheet to hold the @keyframe or VML rules. */
-
- /**
- * 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 < n; i++) {
- parent.appendChild(arguments[i])
- }
-
- return parent
- }
-
- /**
- * Creates an opacity keyframe animation rule and returns its name.
- * Since most mobile Webkits have timing issues with animation-delay,
- * we create separate rules for each line/segment.
- */
- function addAnimation (alpha, trail, i, lines) {
- var name = ['opacity', trail, ~~(alpha * 100), i, lines].join('-')
- , start = 0.01 + i/lines * 100
- , z = Math.max(1 - (1-alpha) / trail * (100-start), alpha)
- , prefix = useCssAnimations.substring(0, useCssAnimations.indexOf('Animation')).toLowerCase()
- , pre = prefix && '-' + prefix + '-' || ''
-
- if (!animations[name]) {
- sheet.insertRule(
- '@' + pre + 'keyframes ' + name + '{' +
- '0%{opacity:' + z + '}' +
- start + '%{opacity:' + alpha + '}' +
- (start+0.01) + '%{opacity:1}' +
- (start+trail) % 100 + '%{opacity:' + alpha + '}' +
- '100%{opacity:' + z + '}' +
- '}', sheet.cssRules.length)
-
- animations[name] = 1
- }
-
- return name
- }
-
- /**
- * Tries various vendor prefixes and returns the first supported property.
- */
- function vendor (el, prop) {
- var s = el.style
- , pp
- , i
-
- prop = prop.charAt(0).toUpperCase() + prop.slice(1)
- if (s[prop] !== undefined) return prop
- for (i = 0; i < prefixes.length; i++) {
- pp = prefixes[i]+prop
- if (s[pp] !== undefined) return pp
- }
- }
-
- /**
- * Sets multiple style properties at once.
- */
- function css (el, prop) {
- for (var n in prop) {
- el.style[vendor(el, n) || n] = prop[n]
- }
-
- return el
- }
-
- /**
- * Fills in default values.
- */
- function merge (obj) {
- for (var i = 1; i < arguments.length; i++) {
- var def = arguments[i]
- for (var n in def) {
- if (obj[n] === undefined) obj[n] = def[n]
- }
- }
- return obj
- }
-
- /**
- * Returns the line color from the given string or array.
- */
- function getColor (color, idx) {
- return typeof color == 'string' ? color : color[idx % color.length]
- }
-
- // Built-in defaults
-
- var defaults = {
- lines: 12 // The number of lines to draw
- , length: 7 // The length of each line
- , width: 5 // The line thickness
- , radius: 10 // The radius of the inner circle
- , scale: 1.0 // Scales overall size of the spinner
- , corners: 1 // Roundness (0..1)
- , color: '#000' // #rgb or #rrggbb
- , opacity: 1/4 // Opacity of the lines
- , rotate: 0 // Rotation offset
- , direction: 1 // 1: clockwise, -1: counterclockwise
- , speed: 1 // Rounds per second
- , trail: 100 // Afterglow percentage
- , fps: 20 // Frames per second when using setTimeout()
- , zIndex: 2e9 // Use a high z-index by default
- , className: 'spinner' // CSS class to assign to the element
- , top: '50%' // center vertically
- , left: '50%' // center horizontally
- , shadow: false // Whether to render a shadow
- , hwaccel: false // Whether to use hardware acceleration (might be buggy)
- , position: 'absolute' // Element positioning
- }
-
- /** The constructor */
- function Spinner (o) {
- this.opts = merge(o || {}, Spinner.defaults, defaults)
- }
-
- // Global defaults that override the built-ins:
- Spinner.defaults = {}
-
- merge(Spinner.prototype, {
- /**
- * Adds the spinner to the given target element. If this instance is already
- * spinning, it is automatically removed from its previous target b calling
- * stop() internally.
- */
- spin: function (target) {
- this.stop()
-
- var self = this
- , o = self.opts
- , el = self.el = createEl(null, {className: o.className})
-
- css(el, {
- position: o.position
- , width: 0
- , zIndex: o.zIndex
- , left: o.left
- , top: o.top
- })
-
- if (target) {
- target.insertBefore(el, target.firstChild || null)
- }
-
- 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.scale * (o.length + o.width) + 'px'
- , height: o.scale * o.width + 'px'
- , background: color
- , boxShadow: shadow
- , transformOrigin: 'left'
- , transform: 'rotate(' + ~~(360/o.lines*i + o.rotate) + 'deg) translate(' + o.scale*o.radius + 'px' + ',0)'
- , borderRadius: (o.corners * o.scale * o.width >> 1) + 'px'
- })
- }
-
- for (; i < o.lines; i++) {
- seg = css(createEl(), {
- position: 'absolute'
- , top: 1 + ~(o.scale * 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: '2px'}))
- ins(el, ins(seg, fill(getColor(o.color, i), '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.scale * (o.length + o.width)
- , s = o.scale * 2 * r
-
- function grp () {
- return css(
- vml('group', {
- coordsize: s + ' ' + s
- , coordorigin: -r + ' ' + -r
- })
- , { width: s, height: s }
- )
- }
-
- var margin = -(o.width + o.length) * o.scale * 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.scale * o.width
- , left: o.scale * o.radius
- , top: -o.scale * o.width >> 1
- , filter: filter
- }
- )
- , vml('fill', {color: getColor(o.color, i), 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
- }
- }
- }
-
- if (typeof document !== 'undefined') {
- sheet = (function () {
- var el = createEl('style', {type : 'text/css'})
- ins(document.getElementsByTagName('head')[0], el)
- return el.sheet || el.styleSheet
- }())
-
- var probe = css(createEl('group'), {behavior: 'url(#default#VML)'})
-
- if (!vendor(probe, 'transform') && probe.adj) initVML()
- else useCssAnimations = vendor(probe, 'animation')
- }
-
- return Spinner
-
-}));
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 07:02:55 +0000