lanes 0.1.2 → 0.1.5

data/client/lanes/styles/bootstrap.scss

@@ -0,0 +1,71 @@
+// Core variables and mixins
+$zindex-navbar:            1;
+$zindex-dropdown:          30;
+$zindex-popover:           30;
+$zindex-tooltip:           10;
+$zindex-navbar-fixed:      1;
+$zindex-modal-background:  25;
+$zindex-modal:             26;
+$zindex-tooltip:           31;
+$grid-gutter-width: 10px;
+$popover-max-width: 320px;
+
+// Core variables and mixins
+@import "bootstrap/variables";
+@import "bootstrap/mixins";
+
+// Reset and dependencies
+@import "bootstrap/normalize";
+@import "bootstrap/print";
+@import "bootstrap/glyphicons";
+
+// Core CSS
+@import "bootstrap/scaffolding";
+@import "bootstrap/type";
+@import "bootstrap/code";
+
+@import "bootstrap-custom-grid";
+// @import "bootstrap/grid";
+
+@import "bootstrap/tables";
+@import "bootstrap/forms";
+@import "bootstrap/buttons";
+
+// Components
+@import "bootstrap/component-animations";
+@import "bootstrap/dropdowns";
+@import "bootstrap/button-groups";
+@import "bootstrap/input-groups";
+@import "bootstrap/navs";
+@import "bootstrap/navbar";
+@import "bootstrap/breadcrumbs";
+@import "bootstrap/pagination";
+@import "bootstrap/pager";
+@import "bootstrap/labels";
+@import "bootstrap/badges";
+@import "bootstrap/jumbotron";
+@import "bootstrap/thumbnails";
+@import "bootstrap/alerts";
+@import "bootstrap/progress-bars";
+@import "bootstrap/media";
+@import "bootstrap/list-group";
+@import "bootstrap/panels";
+@import "bootstrap/responsive-embed";
+@import "bootstrap/wells";
+@import "bootstrap/close";
+
+// Components w/ JavaScript
+/* @import "bootstrap/modals"; */
+@import "bootstrap-custom-modals";
+
+@import "bootstrap/tooltip";
+
+// popover is only included by the popover component
+//@import "bootstrap/popovers";
+
+@import "bootstrap/carousel";
+
+// Utility classes
+@import "bootstrap/utilities";
+@import "bootstrap/responsive-utilities";
+

data/client/lanes/styles/fonts.scss

@@ -1,16 +1,5 @@
-@font-face {
-  font-family: 'skr-icon';
-  src:url(font-path('lanes/styles/fonts/icomoon.eot') + '?-7u8s0f');
-  src:url(font-path('lanes/styles/fonts/icomoon.eot') + '?#iefix-7u8s0f') format('embedded-opentype'),
-  url(font-path('lanes/styles/fonts/icomoon.woff') + '?-7u8s0f') format('woff'),
-  url(font-path('lanes/styles/fonts/icomoon.ttf')  + '?-7u8s0f') format('truetype'),
-  url(font-path('lanes/styles/fonts/icomoon.svg')  + '?-7u8s0f#icomoon') format('svg');
-  font-weight: normal;
-  font-style: normal;
-}
-.lanes {
-  .font-icon-display {
-    font-family: 'skr-icon';
+.font-icon-display {
+    font-family: 'lanes-icon';
     speak: none;
     font-style: normal;
     font-weight: normal;
@@ -25,14 +14,14 @@
     /* Better Font Rendering =========== */
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
-  }
-  [class^="icon-"], [class*=" icon-"] {
-                      @extend .font-icon-display;
-                    }
+}
+
+[class^="icon-"], [class*=" icon-"] {
+  @extend .font-icon-display;
+}
 
-  @import "fonts/style";
+@import "./fonts/style";
 
-  .icon-reset:before {
+.icon-reset:before {
     @extend .icon-refresh:before;
-  }
 }

data/client/lanes/vendor/packaged.js

@@ -427,7 +427,7 @@ extend(Collection.prototype, BackboneEvents, {
     get: function (query, indexName) {
         if (!query) return;
         var index = this._indexes[indexName || this.mainIndex];
-        return index[query] || index[query[this.mainIndex]] || this._indexes.cid[query.cid];
+        return index[query] || index[query[this.mainIndex]] || this._indexes.cid[query] || this._indexes.cid[query.cid];
     },
 
     // Get the model at the given index.
@@ -2443,7 +2443,7 @@ KeyTreeStore.prototype.get = function (keypath) {
 module.exports = KeyTreeStore;
 
 },{}],17:[function(require,module,exports){
-;window.ampersand = window.ampersand || {};window.ampersand["ampersand-subcollection"] = window.ampersand["ampersand-subcollection"] || [];window.ampersand["ampersand-subcollection"].push("1.5.0");
+;window.ampersand = window.ampersand || {};window.ampersand["ampersand-subcollection"] = window.ampersand["ampersand-subcollection"] || [];window.ampersand["ampersand-subcollection"].push("2.0.1");
 var _ = require('underscore');
 var Events = require('backbone-events-standalone');
 var classExtend = require('ampersand-class-extend');
@@ -2452,12 +2452,9 @@ var slice = Array.prototype.slice;
 
 
 function SubCollection(collection, spec) {
-    spec || (spec = {});
     this.collection = collection;
-    this._reset();
-    this._watched = spec.watched || [];
-    this._parseFilters(spec);
-    this._runFilters();
+    this.models = [];
+    this.configure(spec || {}, true);
     this.listenTo(this.collection, 'all', this._onCollectionEvent);
 }
 
@@ -2475,7 +2472,7 @@ _.extend(SubCollection.prototype, Events, underscoreMixins, {
 
     // clears filters fires events for changes
     clearFilters: function () {
-        this._reset();
+        this._resetFilters();
         this._runFilters();
     },
 
@@ -2508,7 +2505,7 @@ _.extend(SubCollection.prototype, Events, underscoreMixins, {
     },
 
     // Update sub collection config, if `clear`
-    // then clear existing filters before start.
+    // then clear existing spec before start.
     // This takes all the same filter arguments
     // as the init function. So you can pass:
     // {
@@ -2518,8 +2515,9 @@ _.extend(SubCollection.prototype, Events, underscoreMixins, {
     //   limit: 20
     // }
     configure: function (opts, clear) {
-        if (clear) this._resetFilters();
-        this._parseFilters(opts);
+        if (clear) this._resetFilters(clear);
+        //_.extend(this._spec, opts);
+        this._parseSpec(opts);
         this._runFilters();
     },
 
@@ -2543,17 +2541,17 @@ _.extend(SubCollection.prototype, Events, underscoreMixins, {
     },
 
     // clear all filters, reset everything
-    _reset: function () {
-        this.models = [];
-        this._resetFilters();
+    reset: function () {
+        this.configure({}, true);
     },
 
     // just reset filters, no model changes
-    _resetFilters: function () {
+    _resetFilters: function (resetComparator) {
         this._filters = [];
         this._watched = [];
         this.limit = undefined;
         this.offset = undefined;
+        if (resetComparator) this.comparator = undefined;
     },
 
     // internal method registering new filter function
@@ -2568,10 +2566,12 @@ _.extend(SubCollection.prototype, Events, underscoreMixins, {
 
     // removes a watched property
     _unwatch: function (item) {
-        this._watched = _.without(this._watched, item);
+        this._watched = _.difference(this._watched, _.isArray(item) ? item : [item]);
     },
 
-    _parseFilters: function (spec) {
+    _parseSpec: function (spec) {
+        if (spec.watched) this._watch(spec.watched);
+        if (spec.comparator) this.comparator = spec.comparator;
         if (spec.where) {
             _.each(spec.where, function (value, item) {
                 this._addFilter(function (model) {
@@ -2584,14 +2584,11 @@ _.extend(SubCollection.prototype, Events, underscoreMixins, {
         if (spec.hasOwnProperty('limit')) this.limit = spec.limit;
         if (spec.hasOwnProperty('offset')) this.offset = spec.offset;
         if (spec.filter) {
-            this._addFilter(spec.filter, false);
+            this._addFilter(spec.filter);
         }
         if (spec.filters) {
             spec.filters.forEach(this._addFilter, this);
         }
-        if (spec.comparator) {
-            this.comparator = spec.comparator;
-        }
     },
 
     _runFilters: function () {
@@ -2614,7 +2611,11 @@ _.extend(SubCollection.prototype, Events, underscoreMixins, {
         if (this.comparator) newModels = _.sortBy(newModels, this.comparator);
 
         // trim it to length
-        if (this.limit || this.offset) newModels = newModels.slice(offset, this.limit + offset);
+        if (this.limit || this.offset) {
+            // Cache a reference to the full filtered set to allow this.filtered.length. Ref: #6
+            this.filtered = newModels;
+            newModels = newModels.slice(offset, this.limit + offset);
+        }
 
         // now we've got our new models time to compare
         toAdd = _.difference(newModels, existingModels);
@@ -2631,19 +2632,20 @@ _.extend(SubCollection.prototype, Events, underscoreMixins, {
             this.trigger('add', model, this);
         }, this);
 
-        // if they contain the same models, but in new order, trigger sort
+        // unless we have the same models in same order trigger `sort`
         if (!_.isEqual(existingModels, newModels)) {
             this.trigger('sort', this);
         }
     },
 
     _onCollectionEvent: function (eventName, model) {
+        var propName = eventName.split(':')[1];
         // conditions under which we should re-run filters
-        if (_.contains(this._watched, eventName.split(':')[1]) || _.contains(['add', 'remove', 'reset', 'sync'], eventName)) {
+        if (propName === this.comparator || _.contains(this._watched, propName) || _.contains(['add', 'remove', 'reset', 'sync'], eventName)) {
             this._runFilters();
         }
         // conditions under which we should proxy the events
-        if ((_.contains(['sync', 'invalid', 'destroy']) || eventName.indexOf('change') !== -1) && this.contains(model)) {
+        if (!_.contains(['add', 'remove'], eventName) && this.contains(model)) {
             this.trigger.apply(this, arguments);
         }
     }