listjs-rails 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 087d23fbff7afa8239893b3f78d337af7499b357
-  data.tar.gz: c44407750874ae87527f8fb8034df2532a506b2d
+  metadata.gz: 5b1aa4cc10a0b9a5783f561f7f485e76edef308b
+  data.tar.gz: b9a579e520c632916b8d3a01901c49480eb7ad7c
 SHA512:
-  metadata.gz: 295bd6c59d5c1ae38dfc4dfa9cb423b0acb47090758d8a58ea6b95fa999552e83bbed7c5a6fbd4fadcb78a2599d8e11545bb974b4669e615af6070a80a70af6b
-  data.tar.gz: 65615a75bcfeaaf888b9723f042b45ebd4d283c180665bdf62759df29b4ded41ef56d0ac1744507b563bca739c999e3e1dbf8213ec08f41a339a62bfa9130dae
+  metadata.gz: 581d62a49e8fa57eecb7b62e5eb1b4bd19019008753750f3e10589ca713476cac26baa729c0778cdf881a9e491ce9f89d2c14d72beaa926f952f3550420d7ffa
+  data.tar.gz: 84de0263e295e12a0919fc21f7fd358c73a813ef69c5b8f3f5eb7e79db3412ba72d880c9b5ce22617d02b94f0cda5e13f8c2b3af77f28d7ed4be5a6eb2b69ea4

data/app/assets/javascripts/list.js

@@ -315,26 +315,45 @@ ClassList.prototype.removeMatching = function(re){
 };
 
 /**
- * Toggle class `name`.
+ * Toggle class `name`, can force state via `force`.
+ *
+ * For browsers that support classList, but do not support `force` yet,
+ * the mistake will be detected and corrected.
  *
  * @param {String} name
+ * @param {Boolean} force
  * @return {ClassList}
  * @api public
  */
 
-ClassList.prototype.toggle = function(name){
+ClassList.prototype.toggle = function(name, force){
   // classList
   if (this.list) {
-    this.list.toggle(name);
+    if ("undefined" !== typeof force) {
+      if (force !== this.list.toggle(name, force)) {
+        this.list.toggle(name); // toggle again to correct
+      }
+    } else {
+      this.list.toggle(name);
+    }
     return this;
   }
 
   // fallback
-  if (this.has(name)) {
-    this.remove(name);
+  if ("undefined" !== typeof force) {
+    if (!force) {
+      this.remove(name);
+    } else {
+      this.add(name);
+    }
   } else {
-    this.add(name);
+    if (this.has(name)) {
+      this.remove(name);
+    } else {
+      this.add(name);
+    }
   }
+
   return this;
 };
 
@@ -431,77 +450,39 @@ exports.unbind = function(el, type, fn, capture){
   return fn;
 };
 });
-require.register("javve-is-collection/index.js", function(exports, require, module){
-var typeOf = require('type')
-
+require.register("javve-to-array/index.js", function(exports, require, module){
 /**
- * Evaluates _obj_ to determine if it's an array, an array-like collection, or
- * something else. This is useful when working with the function `arguments`
- * collection and `HTMLElement` collections.
- * Note: This implementation doesn't consider elements that are also
- *
+ * Convert an array-like object into an `Array`.
+ * If `collection` is already an `Array`, then will return a clone of `collection`.
  *
+ * @param {Array | Mixed} collection An `Array` or array-like object to convert e.g. `arguments` or `NodeList`
+ * @return {Array} Naive conversion of `collection` to a new `Array`.
+ * @api public
+ */
 
-  collections, such as `<form>` and `<select>`, to be array-like.
-
-  @method test
-@param {Object} obj Object to test.
-@return {Number} A number indicating the results of the test:
-
- * 0: Neither an array nor an array-like collection.
- * 1: Real array.
- * 2: Array-like collection.
-
-@api private
- **/
-module.exports = function isCollection(obj) {
-  var type = typeOf(obj)
-  if (type === 'array') return 1
-    switch (type) {
-      case 'arguments': return 2
-      case 'object':
-        if (isNodeList(obj)) return 2
-        try {
-          // indexed, but no tagName (element) or scrollTo/document (window. From DOM.isWindow test which we can't use here),
-          // or functions without apply/call (Safari
-          // HTMLElementCollection bug).
-          if ('length' in obj
-              && !obj.tagName
-            && !(obj.scrollTo && obj.document)
-            && !obj.apply) {
-              return 2
-            }
-        } catch (ex) {}
-      case 'function':
-        if (isNodeList(obj)) return 2
-        try {
-          // indexed, but no tagName (element) or scrollTo/document (window. From DOM.isWindow test which we can't use here),
-          // or functions without apply/call (Safari
-          // HTMLElementCollection bug).
-          if ('length' in obj
-              && !obj.tagName
-            && !(obj.scrollTo && obj.document)
-            && !obj.apply) {
-              return 2
-            }
-        } catch (ex) {}
-      default:
-        return 0
+module.exports = function toArray(collection) {
+  if (typeof collection === 'undefined') return []
+  if (collection === null) return [null]
+  if (collection === window) return [window]
+  if (typeof collection === 'string') return [collection]
+  if (collection instanceof Array) return collection
+  if (typeof collection.length != 'number') return [collection]
+  if (typeof collection === 'function') return [collection]
+
+  var arr = []
+  for (var i = 0; i < collection.length; i++) {
+    if (Object.prototype.hasOwnProperty.call(collection, i) || i in collection) {
+      arr.push(collection[i])
     }
+  }
+  if (!arr.length) return []
+  return arr
 }
 
-function isNodeList(nodes) {
-  return typeof nodes === 'object'
-  && /^\[object (NodeList)\]$/.test(Object.prototype.toString.call(nodes))
-  && nodes.hasOwnProperty('length')
-  && (nodes.length == 0 || (typeof nodes[0] === "object" && nodes[0].nodeType > 0))
-}
-
-
 });
 require.register("javve-events/index.js", function(exports, require, module){
 var events = require('event'),
-  isCollection = require('is-collection');
+  toArray = require('to-array');
 
 /**
  * Bind `el` event `type` to `fn`.
@@ -514,12 +495,9 @@ var events = require('event'),
  */
 
 exports.bind = function(el, type, fn, capture){
-  if (!isCollection(el)) {
-    events.bind(el, type, fn, capture);
-  } else if ( el && el[0] !== undefined ) {
-    for ( var i = 0; i < el.length; i++ ) {
-      events.bind(el[i], type, fn, capture);
-    }
+  el = toArray(el);
+  for ( var i = 0; i < el.length; i++ ) {
+    events.bind(el[i], type, fn, capture);
   }
 };
 
@@ -534,14 +512,12 @@ exports.bind = function(el, type, fn, capture){
  */
 
 exports.unbind = function(el, type, fn, capture){
-  if (!isCollection(el)) {
-    events.unbind(el, type, fn, capture);
-  } else if ( el && el[0] !== undefined ) {
-    for ( var i = 0; i < el.length; i++ ) {
-      events.unbind(el[i], type, fn, capture);
-    }
+  el = toArray(el);
+  for ( var i = 0; i < el.length; i++ ) {
+    events.unbind(el[i], type, fn, capture);
   }
 };
+
 });
 require.register("javve-get-by-class/index.js", function(exports, require, module){
 /**
@@ -714,10 +690,12 @@ module.exports = function(val){
     case '[object RegExp]': return 'regexp';
     case '[object Arguments]': return 'arguments';
     case '[object Array]': return 'array';
+    case '[object Error]': return 'error';
   }
 
   if (val === null) return 'null';
   if (val === undefined) return 'undefined';
+  if (val !== val) return 'nan';
   if (val && val.nodeType === 1) return 'element';
 
   return typeof val.valueOf();
@@ -733,7 +711,6 @@ By Jonny Strömberg (www.jonnystromberg.com, www.listjs.com)
 "use strict";
 
 var document = window.document,
-    events = require('events'),
     getByClass = require('get-by-class'),
     extend = require('extend'),
     indexOf = require('indexof');
@@ -746,38 +723,46 @@ var List = function(id, options, values) {
         addAsync = require('./src/add-async')(self),
         parse = require('./src/parse')(self);
 
-    this.listClass      = "list";
-    this.searchClass    = "search";
-    this.sortClass      = "sort";
-    this.page           = 200;
-    this.i              = 1;
-    this.items          = [];
-    this.visibleItems   = [];
-    this.matchingItems  = [];
-    this.searched       = false;
-    this.filtered       = false;
-    this.handlers       = { 'updated': [] };
-    this.plugins        = {};
-
-    extend(this, options);
-
-    this.listContainer = (typeof(id) === 'string') ? document.getElementById(id) : id;
-    if (!this.listContainer) { return; }
-    this.list           = getByClass(this.listContainer, this.listClass, true);
-
-    this.templater      = require('./src/templater')(self);
-    this.sort           = require('./src/sort')(self);
-    this.search         = require('./src/search')(self);
-    this.filter         = require('./src/filter')(self);
-
     init = {
-        start: function(values) {
+        start: function() {
+            self.listClass      = "list";
+            self.searchClass    = "search";
+            self.sortClass      = "sort";
+            self.page           = 200;
+            self.i              = 1;
+            self.items          = [];
+            self.visibleItems   = [];
+            self.matchingItems  = [];
+            self.searched       = false;
+            self.filtered       = false;
+            self.handlers       = { 'updated': [] };
+            self.plugins        = {};
+            self.helpers        = {
+                getByClass: getByClass,
+                extend: extend,
+                indexOf: indexOf
+            };
+
+            extend(self, options);
+
+            self.listContainer = (typeof(id) === 'string') ? document.getElementById(id) : id;
+            if (!self.listContainer) { return; }
+            self.list           = getByClass(self.listContainer, self.listClass, true);
+
+            self.templater      = require('./src/templater')(self);
+            self.search         = require('./src/search')(self);
+            self.filter         = require('./src/filter')(self);
+            self.sort           = require('./src/sort')(self);
+
+            this.items();
+            self.update();
+            this.plugins();
+        },
+        items: function() {
             parse(self.list);
             if (values !== undefined) {
                 self.add(values);
             }
-            self.update();
-            this.plugins();
         },
         plugins: function() {
             for (var i = 0; i < self.plugins.length; i++) {
@@ -938,7 +923,7 @@ var List = function(id, options, values) {
         return self;
     };
 
-    init.start(values);
+    init.start();
 };
 
 module.exports = List;
@@ -1052,6 +1037,7 @@ module.exports = function(list) {
         searchMethod(target.value);
     });
 
+    list.helpers.toString = toString;
     return searchMethod;
 };
 
@@ -1061,52 +1047,82 @@ var naturalSort = require('natural-sort'),
     classes = require('classes'),
     events = require('events'),
     getByClass = require('get-by-class'),
-    getAttribute = require('get-attribute'),
-    sortButtons;
-
-var clearPreviousSorting = function() {
-    for (var i = 0, il = sortButtons.length; i < il; i++) {
-        classes(sortButtons[i]).remove('asc');
-        classes(sortButtons[i]).remove('desc');
-    }
-};
+    getAttribute = require('get-attribute');
 
 module.exports = function(list) {
-    var sort = function() {
-        var options = {},
-            valueName;
-
-        if (arguments[0].currentTarget || arguments[0].srcElement) {
-            var e = arguments[0],
-                target = e.currentTarget || e.srcElement,
-                newSortingOrder;
-
-            valueName = getAttribute(target, 'data-sort');
-
-            if (classes(target).has('desc')) {
-                options.desc = false;
-                newSortingOrder = 'asc';
-            } else if (classes(target).has('asc')) {
-                options.desc = true;
-                newSortingOrder = 'desc';
+    list.sortFunction = list.sortFunction || function(itemA, itemB, options) {
+        options.desc = options.order == "desc" ? true : false; // Natural sort uses this format
+        return naturalSort(itemA.values()[options.valueName], itemB.values()[options.valueName], options);
+    };
+
+    var buttons = {
+        els: undefined,
+        clear: function() {
+            for (var i = 0, il = buttons.els.length; i < il; i++) {
+                classes(buttons.els[i]).remove('asc');
+                classes(buttons.els[i]).remove('desc');
+            }
+        },
+        getOrder: function(btn) {
+            var predefinedOrder = getAttribute(btn, 'data-order');
+            if (predefinedOrder == "asc" || predefinedOrder == "desc") {
+                return predefinedOrder;
+            } else if (classes(btn).has('desc')) {
+                return "asc";
+            } else if (classes(btn).has('asc')) {
+                return "desc";
             } else {
-                options.desc = false;
-                newSortingOrder = 'asc';
+                return "asc";
+            }
+        },
+        getInSensitive: function(btn, options) {
+            var insensitive = getAttribute(btn, 'data-insensitive');
+            if (insensitive === "true") {
+                options.insensitive = true;
+            } else {
+                options.insensitive = false;
+            }
+        },
+        setOrder: function(options) {
+            for (var i = 0, il = buttons.els.length; i < il; i++) {
+                var btn = buttons.els[i];
+                if (getAttribute(btn, 'data-sort') !== options.valueName) {
+                    continue;
+                }
+                var predefinedOrder = getAttribute(btn, 'data-order');
+                if (predefinedOrder == "asc" || predefinedOrder == "desc") {
+                    if (predefinedOrder == options.order) {
+                        classes(btn).add(options.order);
+                    }
+                } else {
+                    classes(btn).add(options.order);
+                }
             }
-            clearPreviousSorting();
-            classes(target).add(newSortingOrder);
+        }
+    };
+    var sort = function() {
+        list.trigger('sortStart');
+        options = {};
+
+        var target = arguments[0].currentTarget || arguments[0].srcElement || undefined;
+
+        if (target) {
+            options.valueName = getAttribute(target, 'data-sort');
+            buttons.getInSensitive(target, options);
+            options.order = buttons.getOrder(target);
         } else {
-            valueName = arguments[0];
             options = arguments[1] || options;
+            options.valueName = arguments[0];
+            options.order = options.order || "asc";
+            options.insensitive = (typeof options.insensitive == "undefined") ? true : options.insensitive;
         }
+        buttons.clear();
+        buttons.setOrder(options);
 
-        options.insensitive = (typeof options.insensitive == "undefined") ? true : options.insensitive;
-        options.sortFunction = options.sortFunction || function(a, b) {
-            return naturalSort(a.values()[valueName], b.values()[valueName], options);
-        };
-
-        list.trigger('sortStart');
-        list.items.sort(options.sortFunction);
+        options.sortFunction = options.sortFunction || list.sortFunction;
+        list.items.sort(function(a, b) {
+            return options.sortFunction(a, b, options);
+        });
         list.update();
         list.trigger('sortComplete');
     };
@@ -1115,8 +1131,16 @@ module.exports = function(list) {
     list.handlers.sortStart = list.handlers.sortStart || [];
     list.handlers.sortComplete = list.handlers.sortComplete || [];
 
-    sortButtons = getByClass(list.listContainer, list.sortClass);
-    events.bind(sortButtons, 'click', sort);
+    buttons.els = getByClass(list.listContainer, list.sortClass);
+    events.bind(buttons.els, 'click', sort);
+    list.on('searchStart', buttons.clear);
+    list.on('filterStart', buttons.clear);
+
+    // Helpers
+    list.helpers.classes = classes;
+    list.helpers.naturalSort = naturalSort;
+    list.helpers.events = events;
+    list.helpers.getAttribute = getAttribute;
 
     return sort;
 };
@@ -1409,8 +1433,7 @@ require.alias("javve-events/index.js", "list.js/deps/events/index.js");
 require.alias("javve-events/index.js", "events/index.js");
 require.alias("component-event/index.js", "javve-events/deps/event/index.js");
 
-require.alias("javve-is-collection/index.js", "javve-events/deps/is-collection/index.js");
-require.alias("component-type/index.js", "javve-is-collection/deps/type/index.js");
+require.alias("javve-to-array/index.js", "javve-events/deps/to-array/index.js");
 
 require.alias("javve-get-by-class/index.js", "list.js/deps/get-by-class/index.js");
 require.alias("javve-get-by-class/index.js", "get-by-class/index.js");

data/lib/listjs/rails/version.rb

@@ -1,5 +1,5 @@
 module Listjs
   module Rails
-    VERSION = '1.0.2'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: listjs-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Artur Rodrigues
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Gem installation of javascript framework for list and table manipulation,