diff -r a525cc2214e7 -r 2c025db10a10 src/js/utils.js --- a/src/js/utils.js Tue Apr 17 20:19:46 2012 +0200 +++ b/src/js/utils.js Wed Apr 18 18:58:44 2012 +0200 @@ -1,36 +1,5 @@ /* utils.js - various utils that don't belong anywhere else */ -/* trace function, for debugging */ - -IriSP.traceNum = 0; -IriSP.trace = function( msg, value ) { -/* - if( IriSP.config.gui.debug === true ) { - IriSP.traceNum += 1; - IriSP.jQuery( "
"+IriSP.traceNum+" - "+msg+" : "+value+"
" ).appendTo( "#Ldt-output" ); - } -*/ -}; - -/* used in callbacks - because in callbacks we lose "this", - we need to have a special function which wraps "this" in - a closure. This way, the -*/ -IriSP.wrap = function (obj, fn) { - return function() { - var args = Array.prototype.slice.call(arguments, 0); - return fn.apply(obj, args); - } -} - -/* convert a time to a percentage in the media */ -IriSP.timeToPourcent = function(time, timetotal){ - var time = Math.abs(time); - var timetotal = Math.abs(timetotal); - - return Math.floor((time/timetotal) * 100); -}; - IriSP.padWithZeros = function(num) { if (Math.abs(num) < 10) { return "0" + num.toString(); @@ -45,24 +14,6 @@ IriSP.msToTime = function(ms) { return IriSP.secondsToTime(ms / 1000); } -/* convert a number of seconds to a tuple of the form - [hours, minutes, seconds] -*/ -IriSP.secondsToTime = function(secs) { - var hours = Math.abs(parseInt( secs / 3600 ) % 24); - var minutes = Math.abs(parseInt( secs / 60 ) % 60); - var seconds = parseFloat(Math.abs(secs % 60).toFixed(0)); - - var toString_fn = function() { - var ret = ""; - if (hours > 0) - ret = IriSP.padWithZeros(this.hours) + ":"; - ret += IriSP.padWithZeros(this.minutes) + ":" + IriSP.padWithZeros(this.seconds); - - return ret; - } - return {"hours" : hours, "minutes" : minutes, "seconds" : seconds, toString: toString_fn}; -}; /* format a tweet - replaces @name by a link to the profile, #hashtag, etc. */ IriSP.formatTweet = function(tweet) { @@ -114,9 +65,9 @@ /* shortcut to have global variables in templates */ IriSP.templToHTML = function(template, values) { var params = IriSP.underscore.extend( - { "defaults" : IriSP.default_templates_vars, - "l10n" : IriSP.i18n.getMessages() - }, + { + "l10n" : IriSP.i18n.getMessages() + }, values); return Mustache.to_html(template, params); }; @@ -137,12 +88,6 @@ return IriSP.jQuery('#' + IriSP.jqEscape(text)); } -IriSP.__guidCounter = 0; -IriSP.guid = function(prefix) { - IriSP.__guidCounter += 1; - return prefix + IriSP.__guidCounter; -}; - /** returns an url to share on facebook */ IriSP.mkFbUrl = function(url, text) { if (typeof(text) === "undefined") @@ -164,22 +109,8 @@ return "https://plusone.google.com/_/+1/confirm?hl=en&url=" + IriSP.shorten_url(url); }; -/** test if a value is null or undefined */ -IriSP.null_or_undefined = function(val) { - return (typeof(val) === "undefined" || val === null); -}; - /** get a property that can have multiple names **/ -IriSP.get_aliased = function(_obj, _aliases) { - for (var _i = 0; _i < _aliases.length; _i++) { - if (typeof _obj[_aliases[_i]] !== "undefined") { - return _obj[_aliases[_i]]; - } - } - return null; -} - /** issue a call to an url shortener and return the shortened url */ IriSP.shorten_url = function(url) { return encodeURIComponent(url);