ultimate-base 0.5.0.0 → 0.6.0

data/app/assets/javascripts/ultimate/backbone/model.js.coffee

@@ -10,7 +10,6 @@ class Ultimate.Backbone.Model extends Backbone.Model
   expireTime: Infinity
 
   constructor: (attributes, options = {}) ->
-    Ultimate.Backbone.debug ".Model.constructor()", @
     @expireTime = options.expireTime  if options.expireTime?
     @on 'sync', =>
       @loadedTimeStamp = new Date()

data/app/assets/javascripts/ultimate/backbone/router.js.coffee

@@ -2,10 +2,6 @@
 
 class Ultimate.Backbone.Router extends Backbone.Router
 
-  constructor: ->
-    Ultimate.Backbone.debug ".Router.constructor()", @
-    super
-
   namedParam    = /:\w+/g
   splatParam    = /\*\w+/g
   escapeRegExp  = /[-[\]{}()+?.,\\^$|#\s]/g

data/app/assets/javascripts/ultimate/backbone/view-mixins/nodes.js.coffee

@@ -0,0 +1,51 @@
+# Cached regex to split keys for `delegate`, from backbone.js.
+delegateEventSplitter = /^(\S+)\s*(.*)$/
+
+Ultimate.Backbone.ViewMixins.Nodes =
+
+  nodes: null
+
+  # Overwritten parent method Backbone.View.setElement() as hook for findNodes()
+  setElement: (element, delegate) ->
+    @undelegateEvents()  if @$el
+    @$el = if element instanceof Backbone.$ then element else Backbone.$(element)
+    @el = @$el[0]
+    @findNodes() # inserted hook
+    @delegateEvents()  if delegate isnt false
+    @
+
+  findNodes: (jRoot = @$el, nodes = @nodes) ->
+    jNodes = {}
+    nodes = @nodes.call(@)  if _.isFunction(nodes)
+    if _.isObject(nodes)
+      for nodeName, selector of nodes  when nodeName isnt 'selector'
+        _isObject = _.isObject(selector)
+        if _isObject
+          nestedNodes = selector
+          selector = nestedNodes['selector']
+        jNodes[nodeName] = @[nodeName] = jRoot.find(selector)
+        if _isObject
+          _.extend jNodes, @findNodes(jNodes[nodeName], nestedNodes)
+    jNodes
+
+  # Overload and proxy parent method Backbone.View.delegateEvents() as hook for normalizeEvents().
+  delegateEvents: (events) ->
+    args = _.toArray(arguments)
+    args[0] = @normalizeEvents(events)
+    @__super 'delegateEvents', args
+
+  # TODO docs
+  normalizeEvents: (events) ->
+    events = _.result(@, "events")  unless events
+    if events
+      normalizedEvents = {}
+      for key, method of events
+        [[], eventName, selector] = key.match(delegateEventSplitter)
+        selector = _.result(@, selector)
+        selector = selector.selector  if selector instanceof Backbone.$
+        if _.isString(selector)
+          selector = selector.replace(@$el.selector, '')  if _.string.startsWith(selector, @$el.selector)
+          key = "#{eventName} #{selector}"
+        normalizedEvents[key] = method
+      events = normalizedEvents
+    events

data/app/assets/javascripts/ultimate/backbone/view.js.coffee

@@ -1,113 +1,27 @@
-#  * Require ./../underscore/underscore.outcasts
-#  * Require ./../underscore/underscore.string
 #= require ./base
 
 class Ultimate.Backbone.View extends Backbone.View
 
-  loadingState: null
-  loadingWidthMethodName: "innerWidth"
-  loadingHeightMethodName: "innerHeight"
-  loadingStateClass: "loading"
-  loadingOverlayClass: "loading-overlay"
-
-  viewOptions: -> []
-
-  constructor: ->
-    Ultimate.Backbone.debug ".View.constructor()", @
-    super
-
-
-
-  # Overload parent method Backbone.View.setElement() as hook for findNodes() and trick for data("views").
-  setElement: (element, delegate, sideCall = false) ->
-    if @$el?.length and not sideCall
-      views = @$el.data("views")
-      for view in views  when view isnt @
-        view.setElement element, delegate, true
-      @$el.data("views", [])
-    super
-    if @$el.length
-      if views = @$el.data("views")
-        views.push @
-      else
-        @$el.data "views", [@]
-    @findNodes()
-    @
-
-  findNodes: (jRoot = @$el, nodes = @nodes) ->
-    jNodes = {}
-    nodes = if _.isFunction(nodes) then @nodes.call(@) else _.clone(nodes)
-    if _.isObject(nodes)
-      for nodeName, selector of nodes
-        _isObject = _.isObject(selector)
-        if _isObject
-          nestedNodes = selector
-          selector = _.outcasts.delete(nestedNodes, "selector")
-        jNodes[nodeName] = @[nodeName] = jRoot.find(selector)
-        if _isObject
-          _.extend jNodes, @findNodes(jNodes[nodeName], nestedNodes)
-    jNodes
-
-
-
-  # Overload and proxy parent method Backbone.View.delegateEvents() as hook for normalizeEvents().
-  delegateEvents: (events) ->
-    args = _.toArray(arguments)
-    args[0] = @normalizeEvents(events)
-    super args...
-
-  # Cached regex to split keys for `delegate`, from backbone.js.
-  delegateEventSplitter = /^(\S+)\s*(.*)$/
-
-  normalizeEvents: (events) ->
-    events = _.result(@, "events")  unless events
-    if events
-      normalizedEvents = {}
-      for key, method of events
-        [[], eventName, selector] = key.match(delegateEventSplitter)
-        selector = _.result(@, selector)
-        selector = selector.selector  if selector instanceof jQuery
-        if _.isString(selector)
-          selector = selector.replace(@$el.selector, '')  if _.string.startsWith(selector, @$el.selector)
-          key = "#{eventName} #{selector}"
-        normalizedEvents[key] = method
-      events = normalizedEvents
-    events
-
-
-
-  # Overload parent method Backbone.View._configure() as hook for reflectOptions().
+# Mixins support
+  @include: (mixin) ->
+    unless mixin?
+      throw new Error('Mixin is undefined')
+    _.extend @::, mixin
+
+  __super: (methodName, args) ->
+    obj = @
+    calledMethod = @[methodName]
+    obj = obj.constructor.__super__  while obj[methodName] is calledMethod
+    superMethod = obj[methodName]
+    unless superMethod?
+      throw new Error("__super can't find super method '#{methodName}'")
+    superMethod.apply @, args
+
+  # Overload parent method Backbone.View._configure() as hook for reflectOptions()
   _configure: (options) ->
     super
     @reflectOptions()
 
-  reflectOptions: (viewOptions = _.result(@, "viewOptions"), options = @options) ->
-    @[attr] = options[attr]  for attr in viewOptions  when typeof options[attr] isnt "undefined"
-    @[attr] = value  for attr, value of options  when typeof @[attr] isnt "undefined"
+  reflectOptions: (options = @options) ->
+    @[attr] = value  for attr, value of options  when not _.isUndefined(@[attr])
     @
-
-  # Overloadable getter for jQuery-container that will be blocked.
-  getJLoadingContainer: -> @$el
-
-  loading: (state, text = "", circle = false) ->
-    jLoadingContainer = @getJLoadingContainer()
-    if jLoadingContainer?.length
-      jLoadingContainer.removeClass @loadingStateClass
-      jLoadingContainer.children(".#{@loadingOverlayClass}").remove()
-      if @loadingState = state
-        jLoadingContainer.addClass @loadingStateClass
-        style = []
-        if @loadingWidthMethodName
-          style.push "width: #{jLoadingContainer[@loadingWidthMethodName]()}px;"
-        if @loadingHeightMethodName
-          height = jLoadingContainer[@loadingHeightMethodName]()
-          style.push "height: #{height}px; line-height: #{height}px;"
-        text = if text then "<span class=\"text\">#{text}</span>" else ''
-        circle = if circle then "<span class=\"circle\"></span>" else ''
-        jLoadingContainer.append "<div class=\"#{@loadingOverlayClass}\" style=\"#{style.join(' ')}\">#{circle}#{text}</div>"
-
-
-
-  # Improve templating.
-  jst: (name, context = @) ->
-    JST["backbone/templates/#{name}"] context

data/app/assets/javascripts/ultimate/base.js.coffee

@@ -1,11 +1 @@
-#= require ./helpers
-
-@Ultimate ||=
-
-  debugMode: false
-
-  debug: ->
-    if @debugMode
-      a = ["info", "Ultimate"]
-      Array::push.apply a, arguments  if arguments.length > 0
-      cout.apply @, a
+window.Ultimate ||= {}

data/app/assets/javascripts/ultimate/jquery-plugin-adapter.js.coffee

@@ -21,7 +21,6 @@
 ###
 
 Ultimate.createJQueryPlugin = (pluginName, pluginClass) ->
-  Ultimate.debug(".createJQueryPlugin()", pluginName, pluginClass)  if $.isFunction(Ultimate.debug)
   pluginClass.pluginName ||= pluginName
   jQuery.fn[pluginName] = -> @ultimatePluginAdapter pluginName, pluginClass, arguments
 

data/app/assets/javascripts/ultimate/jquery-plugin-class.js.coffee

@@ -1,4 +1,3 @@
-# TODO simlify translations infrastructure
 # `pluginClass` must store propery `$el` as jQuery object wrapped on the target DOM-object in his instance.
 
 #= require ./base
@@ -14,7 +13,6 @@
 # 1 _.bind
 # 1 _.clone
 # 1 _.outcasts.delete
-# 1 _.string.underscored
 # 1 _.string.startsWith
 
 class Ultimate.Plugin
@@ -26,10 +24,6 @@ class Ultimate.Plugin
 
   options: null
 
-  # @defaultLocales: { en: {} }
-  locale: 'en'
-  translations: null
-
   constructor: (options) ->
     @cid = _.uniqueId('ultimatePlugin_')
     @_configure options
@@ -71,7 +65,7 @@ class Ultimate.Plugin
     @_delegateEvents args...
 
   # delegateEvents() from backbone.js
-  _delegateEvents: (events = _.result(@, "events")) ->
+  _delegateEvents: (events = _.result(@, 'events')) ->
     return  unless events
     @undelegateEvents()
     for key, method of events
@@ -86,7 +80,7 @@ class Ultimate.Plugin
         @$el.delegate(selector, eventName, method)
 
   _normalizeEvents: (events) ->
-    events = _.result(@, "events")  unless events
+    events = _.result(@, 'events')  unless events
     if events
       normalizedEvents = {}
       for key, method of events
@@ -103,25 +97,9 @@ class Ultimate.Plugin
   _configure: (options = {}) ->
     @options ||= {}
     _.extend @options, options
-    #cout '@options', @options
     @_reflectOptions()
-    @_initTranslations()
 
-  _reflectOptions: (reflectableOptions = _.result(@, "reflectableOptions"), options = @options) ->
+  _reflectOptions: (reflectableOptions = _.result(@, 'reflectableOptions'), options = @options) ->
     if _.isArray(reflectableOptions)
       @[attr] = options[attr]  for attr in reflectableOptions  when not _.isUndefined(options[attr])
     @[attr] = value  for attr, value of options  when not _.isUndefined(@[attr])
-
-  # use I18n, and modify locale and translations
-  _initTranslations: ->
-    @translations ||= {}
-    if @constructor.defaultLocales?
-      if not @options["locale"] and I18n?.locale of @constructor.defaultLocales
-        @locale = I18n.locale
-        #cout '!!!Set LOCALE FROM I18N ', @locale
-      defaultTranslations = if @locale then @constructor.defaultLocales[@locale] or {} else {}
-      #cout '!!!defaultTranslations', @locale, defaultTranslations
-      _.defaults @translations, defaultTranslations
-
-  t: (key) ->
-    @translations[key] or _.string.humanize(key)

data/app/assets/javascripts/ultimate/jquery.base.js.coffee

@@ -1,5 +1,3 @@
-# TODO: register components
-
 do ($ = jQuery) =>
 
   $.regexp ||= {}

data/app/assets/javascripts/ultimate/underscore/underscore.inflection.js

@@ -33,9 +33,10 @@
     pluralize : function( word, count, includeNumber )
     {
       var result;
-      
+
       if( count !== undefined )
       {
+        count = Math.round(count);
         result = ( count === 1 ) ? this.singularize( word ) : this.pluralize( word );
         result = ( includeNumber ) ? [ count, result ].join( ' ' ) : result;
       }
@@ -56,7 +57,7 @@
         },
         this );
       }
-      
+
       return result;
     },
 
@@ -172,5 +173,5 @@
    * Underscore integration
    */
   _.mixin( inflector.resetInflections( ) );
-  
+
 } )( _ );

data/app/assets/javascripts/ultimate/underscore/underscore.js

@@ -1,12 +1,13 @@
-//     Underscore.js 1.4.2
-//     http://underscorejs.org
-//     (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
-//     Underscore may be freely distributed under the MIT license.
+// Underscore.js 1.4.4
+// ===================
 
-(function() {
+// > http://underscorejs.org
+// > (c) 2009-2013 Jeremy Ashkenas, DocumentCloud Inc.
+// > Underscore may be freely distributed under the MIT license.
 
-  // Baseline setup
-  // --------------
+// Baseline setup
+// --------------
+(function() {
 
   // Establish the root object, `window` in the browser, or `global` on the server.
   var root = this;
@@ -24,7 +25,6 @@
   var push             = ArrayProto.push,
       slice            = ArrayProto.slice,
       concat           = ArrayProto.concat,
-      unshift          = ArrayProto.unshift,
       toString         = ObjProto.toString,
       hasOwnProperty   = ObjProto.hasOwnProperty;
 
@@ -61,11 +61,11 @@
     }
     exports._ = _;
   } else {
-    root['_'] = _;
+    root._ = _;
   }
 
   // Current version.
-  _.VERSION = '1.4.2';
+  _.VERSION = '1.4.4';
 
   // Collection Functions
   // --------------------
@@ -102,6 +102,8 @@
     return results;
   };
 
+  var reduceError = 'Reduce of empty array with no initial value';
+
   // **Reduce** builds up a single result from a list of values, aka `inject`,
   // or `foldl`. Delegates to **ECMAScript 5**'s native `reduce` if available.
   _.reduce = _.foldl = _.inject = function(obj, iterator, memo, context) {
@@ -119,7 +121,7 @@
         memo = iterator.call(context, memo, value, index, list);
       }
     });
-    if (!initial) throw new TypeError('Reduce of empty array with no initial value');
+    if (!initial) throw new TypeError(reduceError);
     return memo;
   };
 
@@ -130,7 +132,7 @@
     if (obj == null) obj = [];
     if (nativeReduceRight && obj.reduceRight === nativeReduceRight) {
       if (context) iterator = _.bind(iterator, context);
-      return arguments.length > 2 ? obj.reduceRight(iterator, memo) : obj.reduceRight(iterator);
+      return initial ? obj.reduceRight(iterator, memo) : obj.reduceRight(iterator);
     }
     var length = obj.length;
     if (length !== +length) {
@@ -146,7 +148,7 @@
         memo = iterator.call(context, memo, obj[index], index, list);
       }
     });
-    if (!initial) throw new TypeError('Reduce of empty array with no initial value');
+    if (!initial) throw new TypeError(reduceError);
     return memo;
   };
 
@@ -177,12 +179,9 @@
 
   // Return all the elements for which a truth test fails.
   _.reject = function(obj, iterator, context) {
-    var results = [];
-    if (obj == null) return results;
-    each(obj, function(value, index, list) {
-      if (!iterator.call(context, value, index, list)) results[results.length] = value;
-    });
-    return results;
+    return _.filter(obj, function(value, index, list) {
+      return !iterator.call(context, value, index, list);
+    }, context);
   };
 
   // Determine whether all of the elements match a truth test.
@@ -216,20 +215,19 @@
   // Determine if the array or object contains a given value (using `===`).
   // Aliased as `include`.
   _.contains = _.include = function(obj, target) {
-    var found = false;
-    if (obj == null) return found;
+    if (obj == null) return false;
     if (nativeIndexOf && obj.indexOf === nativeIndexOf) return obj.indexOf(target) != -1;
-    found = any(obj, function(value) {
+    return any(obj, function(value) {
       return value === target;
     });
-    return found;
   };
 
   // Invoke a method (with arguments) on every item in a collection.
   _.invoke = function(obj, method) {
     var args = slice.call(arguments, 2);
+    var isFunc = _.isFunction(method);
     return _.map(obj, function(value) {
-      return (_.isFunction(method) ? method : value[method]).apply(value, args);
+      return (isFunc ? method : value[method]).apply(value, args);
     });
   };
 
@@ -239,10 +237,10 @@
   };
 
   // Convenience version of a common use case of `filter`: selecting only objects
-  // with specific `key:value` pairs.
-  _.where = function(obj, attrs) {
-    if (_.isEmpty(attrs)) return [];
-    return _.filter(obj, function(value) {
+  // containing specific `key:value` pairs.
+  _.where = function(obj, attrs, first) {
+    if (_.isEmpty(attrs)) return first ? null : [];
+    return _[first ? 'find' : 'filter'](obj, function(value) {
       for (var key in attrs) {
         if (attrs[key] !== value[key]) return false;
       }
@@ -250,6 +248,12 @@
     });
   };
 
+  // Convenience version of a common use case of `find`: getting the first object
+  // containing specific `key:value` pairs.
+  _.findWhere = function(obj, attrs) {
+    return _.where(obj, attrs, true);
+  };
+
   // Return the maximum element or (element-based computation).
   // Can't optimize arrays of integers longer than 65,535 elements.
   // See: https://bugs.webkit.org/show_bug.cgi?id=80797
@@ -258,7 +262,7 @@
       return Math.max.apply(Math, obj);
     }
     if (!iterator && _.isEmpty(obj)) return -Infinity;
-    var result = {computed : -Infinity};
+    var result = {computed : -Infinity, value: -Infinity};
     each(obj, function(value, index, list) {
       var computed = iterator ? iterator.call(context, value, index, list) : value;
       computed >= result.computed && (result = {value : value, computed : computed});
@@ -272,7 +276,7 @@
       return Math.min.apply(Math, obj);
     }
     if (!iterator && _.isEmpty(obj)) return Infinity;
-    var result = {computed : Infinity};
+    var result = {computed : Infinity, value: Infinity};
     each(obj, function(value, index, list) {
       var computed = iterator ? iterator.call(context, value, index, list) : value;
       computed < result.computed && (result = {value : value, computed : computed});
@@ -321,7 +325,7 @@
   // An internal function used for aggregate "group by" operations.
   var group = function(obj, value, context, behavior) {
     var result = {};
-    var iterator = lookupIterator(value);
+    var iterator = lookupIterator(value || _.identity);
     each(obj, function(value, index) {
       var key = iterator.call(context, value, index, obj);
       behavior(result, key, value);
@@ -341,7 +345,7 @@
   // either a string attribute to count by, or a function that returns the
   // criterion.
   _.countBy = function(obj, value, context) {
-    return group(obj, value, context, function(result, key, value) {
+    return group(obj, value, context, function(result, key) {
       if (!_.has(result, key)) result[key] = 0;
       result[key]++;
     });
@@ -363,7 +367,8 @@
   // Safely convert anything iterable into a real, live array.
   _.toArray = function(obj) {
     if (!obj) return [];
-    if (obj.length === +obj.length) return slice.call(obj);
+    if (_.isArray(obj)) return slice.call(obj);
+    if (obj.length === +obj.length) return _.map(obj, _.identity);
     return _.values(obj);
   };
 
@@ -413,7 +418,7 @@
 
   // Trim out all falsy values from an array.
   _.compact = function(array) {
-    return _.filter(array, function(value){ return !!value; });
+    return _.filter(array, _.identity);
   };
 
   // Internal implementation of a recursive `flatten` function.
@@ -442,6 +447,11 @@
   // been sorted, you have the option of using a faster algorithm.
   // Aliased as `unique`.
   _.uniq = _.unique = function(array, isSorted, iterator, context) {
+    if (_.isFunction(isSorted)) {
+      context = iterator;
+      iterator = isSorted;
+      isSorted = false;
+    }
     var initial = iterator ? _.map(array, iterator, context) : array;
     var results = [];
     var seen = [];
@@ -565,25 +575,23 @@
   // Function (ahem) Functions
   // ------------------
 
-  // Reusable constructor function for prototype setting.
-  var ctor = function(){};
-
   // Create a function bound to a given object (assigning `this`, and arguments,
-  // optionally). Binding with arguments is also known as `curry`.
-  // Delegates to **ECMAScript 5**'s native `Function.bind` if available.
-  // We check for `func.bind` first, to fail fast when `func` is undefined.
-  _.bind = function bind(func, context) {
-    var bound, args;
+  // optionally). Delegates to **ECMAScript 5**'s native `Function.bind` if
+  // available.
+  _.bind = function(func, context) {
     if (func.bind === nativeBind && nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
-    if (!_.isFunction(func)) throw new TypeError;
-    args = slice.call(arguments, 2);
-    return bound = function() {
-      if (!(this instanceof bound)) return func.apply(context, args.concat(slice.call(arguments)));
-      ctor.prototype = func.prototype;
-      var self = new ctor;
-      var result = func.apply(self, args.concat(slice.call(arguments)));
-      if (Object(result) === result) return result;
-      return self;
+    var args = slice.call(arguments, 2);
+    return function() {
+      return func.apply(context, args.concat(slice.call(arguments)));
+    };
+  };
+
+  // Partially apply a function by creating a version that has had some of its
+  // arguments pre-filled, without changing its dynamic `this` context.
+  _.partial = function(func) {
+    var args = slice.call(arguments, 1);
+    return function() {
+      return func.apply(this, args.concat(slice.call(arguments)));
     };
   };
 
@@ -591,7 +599,7 @@
   // all callbacks defined on an object belong to it.
   _.bindAll = function(obj) {
     var funcs = slice.call(arguments, 1);
-    if (funcs.length == 0) funcs = _.functions(obj);
+    if (funcs.length === 0) funcs = _.functions(obj);
     each(funcs, function(f) { obj[f] = _.bind(obj[f], obj); });
     return obj;
   };
@@ -622,25 +630,26 @@
   // Returns a function, that, when invoked, will only be triggered at most once
   // during a given window of time.
   _.throttle = function(func, wait) {
-    var context, args, timeout, throttling, more, result;
-    var whenDone = _.debounce(function(){ more = throttling = false; }, wait);
+    var context, args, timeout, result;
+    var previous = 0;
+    var later = function() {
+      previous = new Date;
+      timeout = null;
+      result = func.apply(context, args);
+    };
     return function() {
-      context = this; args = arguments;
-      var later = function() {
+      var now = new Date;
+      var remaining = wait - (now - previous);
+      context = this;
+      args = arguments;
+      if (remaining <= 0) {
+        clearTimeout(timeout);
         timeout = null;
-        if (more) {
-          result = func.apply(context, args);
-        }
-        whenDone();
-      };
-      if (!timeout) timeout = setTimeout(later, wait);
-      if (throttling) {
-        more = true;
-      } else {
-        throttling = true;
+        previous = now;
         result = func.apply(context, args);
+      } else if (!timeout) {
+        timeout = setTimeout(later, remaining);
       }
-      whenDone();
       return result;
     };
   };
@@ -758,8 +767,10 @@
   // Extend a given object with all the properties in passed-in object(s).
   _.extend = function(obj) {
     each(slice.call(arguments, 1), function(source) {
-      for (var prop in source) {
-        obj[prop] = source[prop];
+      if (source) {
+        for (var prop in source) {
+          obj[prop] = source[prop];
+        }
       }
     });
     return obj;
@@ -788,8 +799,10 @@
   // Fill in a given object with default properties.
   _.defaults = function(obj) {
     each(slice.call(arguments, 1), function(source) {
-      for (var prop in source) {
-        if (obj[prop] == null) obj[prop] = source[prop];
+      if (source) {
+        for (var prop in source) {
+          if (obj[prop] == null) obj[prop] = source[prop];
+        }
       }
     });
     return obj;
@@ -954,7 +967,7 @@
 
   // Is a given object a finite number?
   _.isFinite = function(obj) {
-    return _.isNumber(obj) && isFinite(obj);
+    return isFinite(obj) && !isNaN(parseFloat(obj));
   };
 
   // Is the given value `NaN`? (NaN is the only number which does not equal itself).
@@ -1000,7 +1013,9 @@
 
   // Run a function **n** times.
   _.times = function(n, iterator, context) {
-    for (var i = 0; i < n; i++) iterator.call(context, i);
+    var accum = Array(n);
+    for (var i = 0; i < n; i++) accum[i] = iterator.call(context, i);
+    return accum;
   };
 
   // Return a random integer between min and max (inclusive).
@@ -1009,7 +1024,7 @@
       max = min;
       min = 0;
     }
-    return min + (0 | Math.random() * (max - min + 1));
+    return min + Math.floor(Math.random() * (max - min + 1));
   };
 
   // List of HTML entities for escaping.
@@ -1065,7 +1080,7 @@
   // Useful for temporary DOM ids.
   var idCounter = 0;
   _.uniqueId = function(prefix) {
-    var id = idCounter++;
+    var id = ++idCounter + '';
     return prefix ? prefix + id : id;
   };
 
@@ -1100,6 +1115,7 @@
   // Underscore templating handles arbitrary delimiters, preserves whitespace,
   // and correctly escapes quotes within interpolated code.
   _.template = function(text, data, settings) {
+    var render;
     settings = _.defaults({}, settings, _.templateSettings);
 
     // Combine delimiters into one regular expression via alternation.
@@ -1115,11 +1131,18 @@
     text.replace(matcher, function(match, escape, interpolate, evaluate, offset) {
       source += text.slice(index, offset)
         .replace(escaper, function(match) { return '\\' + escapes[match]; });
-      source +=
-        escape ? "'+\n((__t=(" + escape + "))==null?'':_.escape(__t))+\n'" :
-        interpolate ? "'+\n((__t=(" + interpolate + "))==null?'':__t)+\n'" :
-        evaluate ? "';\n" + evaluate + "\n__p+='" : '';
+
+      if (escape) {
+        source += "'+\n((__t=(" + escape + "))==null?'':_.escape(__t))+\n'";
+      }
+      if (interpolate) {
+        source += "'+\n((__t=(" + interpolate + "))==null?'':__t)+\n'";
+      }
+      if (evaluate) {
+        source += "';\n" + evaluate + "\n__p+='";
+      }
       index = offset + match.length;
+      return match;
     });
     source += "';\n";
 
@@ -1131,7 +1154,7 @@
       source + "return __p;\n";
 
     try {
-      var render = new Function(settings.variable || 'obj', '_', source);
+      render = new Function(settings.variable || 'obj', '_', source);
     } catch (e) {
       e.source = source;
       throw e;