new assets compressed with uglifyjs

iloire · Apr 29, 2012 · 0ed0405 · 0ed0405
1 parent d65d203
commit 0ed0405
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 10 deletions.
diff --git a/public/javascripts/bootstrap-popover.min.js b/public/javascripts/bootstrap-popover.min.js
diff --git a/public/javascripts/bootstrap-twipsy.min.js b/public/javascripts/bootstrap-twipsy.min.js
diff --git a/public/javascripts/directory.js b/public/javascripts/directory.js
@@ -530,7 +530,7 @@ $(document).ready(function () {
 	});
 
 	$('a.fav').live ('click', function(){
-		var id = $(this).attr('idProfile');		
+		var id = $(this).attr('idProfile');
 		var params = {favstatus:$(this).attr('fav'), id:id};
 		directory.favorite (params, function(err, user_fav){
 			directory.invalidate_cache();

diff --git a/public/javascripts/directory.min.js b/public/javascripts/directory.min.js
diff --git a/public/javascripts/jquery.timeago.js b/public/javascripts/jquery.timeago.js
@@ -3,7 +3,7 @@
  * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago").
  *
  * @name timeago
- * @version 0.10.0
+ * @version 0.11.1
  * @requires jQuery v1.2.3+
  * @author Ryan McGeary
  * @license MIT License - http://www.opensource.org/licenses/mit-license.php
@@ -45,6 +45,7 @@
         months: "%d months",
         year: "about a year",
         years: "%d years",
+        wordSeparator: " ",
         numbers: []
       }
     },
@@ -76,14 +77,15 @@
         minutes < 45 && substitute($l.minutes, Math.round(minutes)) ||
         minutes < 90 && substitute($l.hour, 1) ||
         hours < 24 && substitute($l.hours, Math.round(hours)) ||
-        hours < 48 && substitute($l.day, 1) ||
-        days < 30 && substitute($l.days, Math.floor(days)) ||
-        days < 60 && substitute($l.month, 1) ||
-        days < 365 && substitute($l.months, Math.floor(days / 30)) ||
-        years < 2 && substitute($l.year, 1) ||
-        substitute($l.years, Math.floor(years));
+        hours < 42 && substitute($l.day, 1) ||
+        days < 30 && substitute($l.days, Math.round(days)) ||
+        days < 45 && substitute($l.month, 1) ||
+        days < 365 && substitute($l.months, Math.round(days / 30)) ||
+        years < 1.5 && substitute($l.year, 1) ||
+        substitute($l.years, Math.round(years));
 
-      return $.trim([prefix, words, suffix].join(" "));
+      var separator = $l.wordSeparator === undefined ?  " " : $l.wordSeparator;
+      return $.trim([prefix, words, suffix].join(separator));
     },
     parse: function(iso8601) {
       var s = $.trim(iso8601);
@@ -143,4 +145,4 @@
   // fix for IE6 suckage
   document.createElement("abbr");
   document.createElement("time");
-}(jQuery));
+}(jQuery));