ende 0.5.6 → 0.5.7

data/components/component/matches-selector/{0.1.2 → 0.1.4}/component.json

@@ -1,7 +1,7 @@
 {
   "name": "matches-selector",
   "description": "Check if an element matches a given selector",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "keywords": [
     "match",
     "element",

data/components/indefinido/advisable/master/component.json

@@ -1,7 +1,7 @@
 {
   "name": "advisable",
   "description": "Aspect oriented programming mixin",
-  "version": "0.0.1",
+  "version": "0.1.0",
   "keywords": [
     "aspect",
     "aop",

data/components/indefinido/indemma/master/component.json

@@ -1,10 +1,11 @@
 {
   "name": "indemma",
+  "repository": "indefinido/indemma",
   "description": "Indemma (mind picture = memory), client side ES5 observable REST model",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "keywords": [],
   "dependencies": {
-    "pluma/assimilate": "0.3.0",
+    "pluma/assimilate": "0.4.0",
     "component/type": "*",
     "component/bind": "*",
     "component/jquery": "*",
@@ -21,9 +22,6 @@
     ]
   },
   "license": "WTFPL",
-  "paths": [
-    "vendor/components"
-  ],
   "scripts": [
     "index.js",
     "lib/extensions/rivets.js",
@@ -50,6 +48,5 @@
     "lib/record/validations/validatorable.js",
     "vendor/stampit.js",
     "vendor/owl/pluralize.js"
-  ],
-  "repository": "indefinido/indemma"
+  ]
 }

data/components/indefinido/indemma/master/lib/record.js

@@ -95,7 +95,7 @@ this.model = (function() {
     return instance;
   };
   mixer = function(options) {
-    var after_initialize, callback, instance, _i, _len, _ref;
+    var after_initialize, after_mix, callback, instance, _i, _len, _ref;
 
     if (this === window) {
       throw 'Model mixin called incorrectly call with model.call {} instead of model({})';
@@ -108,12 +108,17 @@ this.model = (function() {
     } else {
       after_initialize = [];
     }
+    if (this.after_mix) {
+      after_mix = this.after_mix.splice(0);
+    } else {
+      after_mix = [];
+    }
     instance = bind(this, initialize_record);
     extend(instance, merge(this, modelable));
     this.record = instance.record = merge({}, instance.record, modelable.record);
     this.record.after_initialize = instance.record.after_initialize = instance.record.after_initialize.concat(after_initialize);
     this.record.before_initialize = instance.record.before_initialize.concat([]);
-    _ref = modelable.after_mix;
+    _ref = modelable.after_mix.concat(after_mix);
     for (_i = 0, _len = _ref.length; _i < _len; _i++) {
       callback = _ref[_i];
       callback.call(instance, instance);

data/components/indefinido/indemma/master/lib/record/dirtyable.js

@@ -1,9 +1,9 @@
 'use strict';
-var dirtyable, model, record;
+var dirt, dirtyable, model, record;
 
 dirtyable = {
   ignores: ['dirty', 'resource', 'route', 'initial_route', 'after_initialize', 'before_initialize', 'parent_resource', 'nested_attributes', 'reloading', 'ready', 'saving', 'salvation', 'sustained', 'element', 'default', 'lock', 'validated', 'validation', 'errors', 'dirty'],
-  change: function(name) {
+  reserved_filter: function(name) {
     return dirtyable.ignores.indexOf(name) === -1;
   },
   descriptor: {
@@ -11,9 +11,7 @@ dirtyable = {
       return this.observed.dirty;
     },
     set: function(value) {
-      this.observed.dirty = value;
-      this.observation.scheduler.schedule();
-      return value;
+      return this.observed.dirty = value;
     }
   },
   record: {
@@ -21,12 +19,23 @@ dirtyable = {
       Object.defineProperty(this, 'dirty', dirtyable.descriptor);
       this.observed.dirty = !!this._id;
       return this.subscribe(function(added, removed, changed, past) {
-        return this.dirty || (this.dirty = !!Object.keys(changed).filter(dirtyable.change).length);
+        this.dirty || (this.dirty = !!Object.keys(changed).filter(dirtyable.reserved_filter).length);
+        this.dirty || (this.dirty = !!Object.keys(added).filter(dirtyable.reserved_filter).length);
+        return this.dirty || (this.dirty = !!Object.keys(removed).filter(dirtyable.reserved_filter).length);
       });
     }
   }
 };
 
+if (!Object.observe) {
+  dirt = dirtyable.descriptor.set;
+  dirtyable.descriptor.set = function(value) {
+    value = dirt.apply(this, arguments);
+    this.observation.scheduler.schedule();
+    return value;
+  };
+}
+
 model = window.model;
 
 record = window.record;

data/components/indefinido/indemma/master/lib/record/scopable.js

@@ -43,7 +43,7 @@ scopable = {
       } else {
         this["$" + name] = defaults[type] || type;
       }
-      if ($.type(type) !== 'string') {
+      if ($.type(type) !== 'string' || type.toString() === '') {
         type = $.type(type);
       }
       builder = builders[type];

data/components/indefinido/observable/es6-modules/component.json

@@ -2,7 +2,7 @@
   "name": "observable",
   "repository": "indefinido/observable",
   "description": "Observable capabilities built upon observable shim.",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "keywords": [],
   "dependencies": {
     "component/jquery": "*"

data/components/indefinido/observable/es6-modules/lib/legacy/schedulerable.js

@@ -117,15 +117,20 @@ schedulerable.schedulable_observers = function() {
 };
 
 schedulerable.augment = function(observable) {
-  var original;
+  var subscribe, unobserve;
 
-  original = observable.methods.subscribe;
+  subscribe = observable.methods.subscribe;
   observable.methods.subscribe = function(keypath, callback) {
-    original.apply(this, arguments);
+    subscribe.apply(this, arguments);
     if (typeof keypath !== 'function') {
       return this.observation.scheduler.schedulable(this, keypath);
     }
   };
+  unobserve = observable.unobserve;
+  observable.unobserve = function() {
+    unobserve.apply(this, arguments);
+    return object.observation.scheduler.destroy();
+  };
   return jQuery.extend((function() {
     var object;
 

data/components/indefinido/observable/es6-modules/lib/observable.js

@@ -52,7 +52,6 @@ jQuery.extend(observable, {
       delete object[name];
     }
     object.observation.destroy();
-    object.observation.scheduler.destroy();
     delete object.observation;
     delete object.observed;
     return object;

data/components/indefinido/observable/es6-modules/lib/observable/observation.js

@@ -7,14 +7,14 @@ observation = {
   remove: function(keypath, callback) {
     return this.observers[keypath].remove(callback);
   },
-  deliver: function() {
+  deliver: function(discard) {
     var keypath, observer, _ref, _results;
 
     _ref = this.observers;
     _results = [];
     for (keypath in _ref) {
       observer = _ref[keypath];
-      _results.push(observer.deliver());
+      _results.push(observer.deliver(discard));
     }
     return _results;
   },

data/components/paulmillr/es6-shim/{0.10.1 → 0.14.0}/component.json

@@ -1,6 +1,6 @@
 {
   "name": "es6-shim",
-  "version": "0.10.1",
+  "version": "0.14.0",
   "description": "ECMAScript 6 (Harmony) compatibility shims for legacy JavaScript engines",
   "keywords": [
     "ecmascript",

data/components/paulmillr/es6-shim/{0.10.1 → 0.14.0}/es6-shim.js

@@ -1,4 +1,4 @@
-// ES6-shim 0.10.1 (c) 2013-2014 Paul Miller (http://paulmillr.com)
+// ES6-shim 0.14.0 (c) 2013-2014 Paul Miller (http://paulmillr.com)
 // ES6-shim may be freely distributed under the MIT license.
 // For more details and documentation:
 // https://github.com/paulmillr/es6-shim/
@@ -48,8 +48,12 @@
     return rejectsRegex;
   };
 
+  /*jshint evil: true */
+  var getGlobal = new Function('return this;');
+  /*jshint evil: false */
+
   var main = function() {
-    var globals = (typeof global === 'undefined') ? window : global;
+    var globals = getGlobal();
     var global_isFinite = globals.isFinite;
     var supportsDescriptors = !!Object.defineProperty && arePropertyDescriptorsSupported();
     var startsWithIsCompliant = startsWithRejectsRegex();
@@ -57,6 +61,7 @@
     var _indexOf = String.prototype.indexOf;
     var _toString = Object.prototype.toString;
     var _hasOwnProperty = Object.prototype.hasOwnProperty;
+    var ArrayIterator; // make our implementation private
 
     // Define configurable, writable and non-enumerable props
     // if they don’t exist.
@@ -77,12 +82,24 @@
       });
     };
 
+    // Simple shim for Object.create on ES3 browsers
+    // (unlike real shim, no attempt to support `prototype === null`)
+    var create = Object.create || function(prototype, properties) {
+      function Type() {}
+      Type.prototype = prototype;
+      var object = new Type();
+      if (typeof properties !== "undefined") {
+        defineProperties(object, properties);
+      }
+      return object;
+    };
+
     // This is a private name in the es6 spec, equal to '[Symbol.iterator]'
     // we're going to use an arbitrary _-prefixed name to make our shims
     // work properly with each other, even though we don't have full Iterator
     // support.  That is, `Array.from(map.keys())` will work, but we don't
     // pretend to export a "real" Iterator interface.
-    var $iterator$ = (typeof Symbol === 'object' && Symbol.iterator) ||
+    var $iterator$ = (typeof Symbol === 'function' && Symbol.iterator) ||
       '_es6shim_iterator_';
     // Firefox ships a partial implementation using the name @@iterator.
     // https://bugzilla.mozilla.org/show_bug.cgi?id=907077#c14
@@ -221,7 +238,7 @@
           obj = C['@@create']();
         } else {
           // OrdinaryCreateFromConstructor
-          obj = Object.create(C.prototype || null);
+          obj = create(C.prototype || null);
         }
         // Mark that we've used the es6 construct path
         // (see emulateES6construct)
@@ -311,8 +328,8 @@
         // Bits to bytes
         bytes = [];
         while (str.length) {
-          bytes.push(parseInt(str.substring(0, 8), 2));
-          str = str.substring(8);
+          bytes.push(parseInt(str.slice(0, 8), 2));
+          str = str.slice(8);
         }
         return bytes;
       }
@@ -334,9 +351,9 @@
 
         // Unpack sign, exponent, fraction
         bias = (1 << (ebits - 1)) - 1;
-        s = parseInt(str.substring(0, 1), 2) ? -1 : 1;
-        e = parseInt(str.substring(1, 1 + ebits), 2);
-        f = parseInt(str.substring(1 + ebits), 2);
+        s = parseInt(str.slice(0, 1), 2) ? -1 : 1;
+        e = parseInt(str.slice(1, 1 + ebits), 2);
+        f = parseInt(str.slice(1 + ebits), 2);
 
         // Produce number
         if (e === (1 << ebits) - 1) {
@@ -371,7 +388,7 @@
     }());
 
     defineProperties(String, {
-      fromCodePoint: function() {
+      fromCodePoint: function(_) { // length = 1
         var points = _slice.call(arguments, 0, arguments.length);
         var result = [];
         var next;
@@ -489,6 +506,31 @@
     };
     defineProperties(String.prototype, StringShims);
 
+    var hasStringTrimBug = '\u0085'.trim().length !== 1;
+    if (hasStringTrimBug) {
+      var originalStringTrim = String.prototype.trim;
+      delete String.prototype.trim;
+      // whitespace from: http://es5.github.io/#x15.5.4.20
+      // implementation from https://github.com/es-shims/es5-shim/blob/v3.4.0/es5-shim.js#L1304-L1324
+      var ws = [
+        '\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003',
+        '\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028',
+        '\u2029\uFEFF'
+      ].join('');
+      var trimBeginRegexp = new RegExp('^[' + ws + '][' + ws + ']*');
+      var trimEndRegexp = new RegExp('[' + ws + '][' + ws + ']*$');
+      defineProperties(String.prototype, {
+        trim: function() {
+          if (this === undefined || this === null) {
+            throw new TypeError("can't convert " + this + " to object");
+          }
+          return String(this)
+            .replace(trimBeginRegexp, "")
+            .replace(trimEndRegexp, "");
+          }
+      });
+    }
+
     // see https://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype-@@iterator
     var StringIterator = function(s) {
       this._s = String(ES.CheckObjectCoercible(s));
@@ -496,7 +538,7 @@
     };
     StringIterator.prototype.next = function() {
       var s = this._s, i = this._i;
-      if (s===undefined || i >= s.length) {
+      if (s === undefined || i >= s.length) {
         this._s = undefined;
         return { value: undefined, done: true };
       }
@@ -551,8 +593,8 @@
           } else {
             value = list[i];
           }
-          if (mapFn !== undefined) {
-            result[i] = thisArg ? mapFn.call(thisArg, value) : mapFn(value);
+          if (mapFn) {
+            result[i] = thisArg ? mapFn.call(thisArg, value, i) : mapFn(value, i);
           } else {
             result[i] = value;
           }
@@ -567,18 +609,18 @@
       }
     });
 
-    defineProperties(globals, {
-      ArrayIterator: function(array, kind) {
+    // Our ArrayIterator is private; see
+    // https://github.com/paulmillr/es6-shim/issues/252
+    ArrayIterator = function(array, kind) {
         this.i = 0;
         this.array = array;
         this.kind = kind;
-      }
-    });
+    };
 
     defineProperties(ArrayIterator.prototype, {
       next: function() {
         var i = this.i, array = this.array;
-        if (i===undefined || this.kind===undefined) {
+        if (i === undefined || this.kind === undefined) {
           throw new TypeError('Not an ArrayIterator');
         }
         if (array!==undefined) {
@@ -588,11 +630,9 @@
             var retval;
             if (kind === "key") {
               retval = i;
-            }
-            if (kind === "value") {
+            } else if (kind === "value") {
               retval = array[i];
-            }
-            if (kind === "entry") {
+            } else if (kind === "entry") {
               retval = [i, array[i]];
             }
             this.i = i + 1;
@@ -635,16 +675,19 @@
         }
         return o;
       },
+
       fill: function(value) {
-        var start = arguments[1], end = arguments[2]; // fill.length===1
+        var start = arguments.length > 1 ? arguments[1] : undefined;
+        var end = arguments.length > 2 ? arguments[2] : undefined;
         var O = ES.ToObject(this);
         var len = ES.ToLength(O.length);
-        start = ES.ToInteger(start===undefined ? 0 : start);
-        end = ES.ToInteger(end===undefined ? len : end);
+        start = ES.ToInteger(start === undefined ? 0 : start);
+        end = ES.ToInteger(end === undefined ? len : end);
 
         var relativeStart = start < 0 ? Math.max(len + start, 0) : Math.min(start, len);
+        var relativeEnd = end < 0 ? len + end : end;
 
-        for (var i = relativeStart; i < len && i < end; ++i) {
+        for (var i = relativeStart; i < len && i < relativeEnd; ++i) {
           O[i] = value;
         }
         return O;
@@ -696,7 +739,9 @@
     addIterator(Array.prototype, function() { return this.values(); });
     // Chrome defines keys/values/entries on Array, but doesn't give us
     // any way to identify its iterator.  So add our own shimmed field.
-    addIterator(Object.getPrototypeOf([].values()));
+    if (Object.getPrototypeOf) {
+      addIterator(Object.getPrototypeOf([].values()));
+    }
 
     var maxSafeInteger = Math.pow(2, 53) - 1;
     defineProperties(Number, {
@@ -712,15 +757,12 @@
       },
 
       isInteger: function(value) {
-        return typeof value === 'number' &&
-          !Number.isNaN(value) &&
-          Number.isFinite(value) &&
+        return Number.isFinite(value) &&
           ES.ToInteger(value) === value;
       },
 
       isSafeInteger: function(value) {
-        return Number.isInteger(value) &&
-          Math.abs(value) <= Number.MAX_SAFE_INTEGER;
+        return Number.isInteger(value) && Math.abs(value) <= Number.MAX_SAFE_INTEGER;
       },
 
       isNaN: function(value) {
@@ -734,19 +776,8 @@
 
     });
 
-    defineProperties(Number.prototype, {
-    });
-
     if (supportsDescriptors) {
       defineProperties(Object, {
-        getOwnPropertyDescriptors: function(subject) {
-          var descs = {};
-          Object.getOwnPropertyNames(subject).forEach(function(propName) {
-            descs[propName] = Object.getOwnPropertyDescriptor(subject, propName);
-          });
-          return descs;
-        },
-
         getPropertyDescriptor: function(subject, name) {
           var pd = Object.getOwnPropertyDescriptor(subject, name);
           var proto = Object.getPrototypeOf(subject);
@@ -772,20 +803,32 @@
             proto = Object.getPrototypeOf(proto);
           }
           return result;
-        },
-
-        // 19.1.3.1
-        assign: function(target, source) {
-          return Object.keys(source).reduce(function(target, key) {
-            target[key] = source[key];
-            return target;
-          }, target);
         }
       });
 
-      // 19.1.3.9
-      // shim from https://gist.github.com/WebReflection/5593554
       defineProperties(Object, {
+        // 19.1.3.1
+        assign: function(target, source) {
+          if (!ES.TypeIsObject(target)) {
+            throw new TypeError('target must be an object');
+          }
+          return Array.prototype.reduce.call(arguments, function(target, source) {
+            if (!ES.TypeIsObject(source)) {
+              throw new TypeError('source must be an object');
+            }
+            return Object.keys(source).reduce(function(target, key) {
+              target[key] = source[key];
+              return target;
+            }, target);
+          });
+        },
+
+        is: function(a, b) {
+          return ES.SameValue(a, b);
+        },
+
+        // 19.1.3.9
+        // shim from https://gist.github.com/WebReflection/5593554
         setPrototypeOf: (function(Object, magic) {
           var set;
 
@@ -859,16 +902,6 @@
       })();
     }
 
-    defineProperties(Object, {
-      getOwnPropertyKeys: function(subject) {
-        return Object.keys(subject);
-      },
-
-      is: function(a, b) {
-        return ES.SameValue(a, b);
-      }
-    });
-
     try {
       Object.keys('foo');
     } catch (e) {
@@ -918,7 +951,6 @@
       clz32: function(value) {
         // See https://bugs.ecmascript.org/show_bug.cgi?id=2465
         value = Number(value);
-        if (Number.isNaN(value)) return NaN;
         var number = ES.ToUint32(value);
         if (number === 0) {
           return 32;
@@ -940,15 +972,7 @@
         value = Number(value);
         if (value === -Infinity) return -1;
         if (!global_isFinite(value) || value === 0) return value;
-        var result = 0;
-        var n = 50;
-        for (var i = 1; i < n; i++) {
-          for (var j = 2, factorial = 1; j <= i; j++) {
-            factorial *= j;
-          }
-          result += Math.pow(value, i) / factorial;
-        }
-        return result;
+        return Math.exp(value) - 1;
       },
 
       hypot: function(x, y) {
@@ -1035,6 +1059,8 @@
 
       imul: function(x, y) {
         // taken from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/imul
+        x = ES.ToUint32(x);
+        y = ES.ToUint32(y);
         var ah  = (x >>> 16) & 0xffff;
         var al = x & 0xffff;
         var bh  = (y >>> 16) & 0xffff;
@@ -1105,30 +1131,44 @@
 
       // find an appropriate setImmediate-alike
       var setTimeout = globals.setTimeout;
-      var makeZeroTimeout = function() {
-        // from http://dbaron.org/log/20100309-faster-timeouts
-        var timeouts = [];
-        var messageName = "zero-timeout-message";
-        var setZeroTimeout = function(fn) {
-          timeouts.push(fn);
-          window.postMessage(messageName, "*");
+      var makeZeroTimeout;
+      if (typeof window !== 'undefined' && ES.IsCallable(window.postMessage)) {
+        makeZeroTimeout = function() {
+          // from http://dbaron.org/log/20100309-faster-timeouts
+          var timeouts = [];
+          var messageName = "zero-timeout-message";
+          var setZeroTimeout = function(fn) {
+            timeouts.push(fn);
+            window.postMessage(messageName, "*");
+          };
+          var handleMessage = function(event) {
+            if (event.source == window && event.data == messageName) {
+              event.stopPropagation();
+              if (timeouts.length === 0) { return; }
+              var fn = timeouts.shift();
+              fn();
+            }
+          };
+          window.addEventListener("message", handleMessage, true);
+          return setZeroTimeout;
         };
-        var handleMessage = function(event) {
-          if (event.source == window && event.data == messageName) {
-            event.stopPropagation();
-            if (timeouts.length === 0) { return; }
-            var fn = timeouts.shift();
-            fn();
-          }
+      }
+      var makePromiseAsap = function() {
+        // An efficient task-scheduler based on a pre-existing Promise
+        // implementation, which we can use even if we override the
+        // global Promise below (in order to workaround bugs)
+        // https://github.com/Raynos/observ-hash/issues/2#issuecomment-35857671
+        var P = globals.Promise;
+        return P && P.resolve && function(task) {
+          return P.resolve().then(task);
         };
-        window.addEventListener("message", handleMessage, true);
-        return setZeroTimeout;
       };
       var enqueue = ES.IsCallable(globals.setImmediate) ?
         globals.setImmediate.bind(globals) :
         typeof process === 'object' && process.nextTick ? process.nextTick :
-        ES.IsCallable(window.postMessage) ? makeZeroTimeout() :
-        function(task) { setTimeout(task, 0); }; // fallback
+        makePromiseAsap() ||
+        (ES.IsCallable(makeZeroTimeout) ? makeZeroTimeout() :
+        function(task) { setTimeout(task, 0); }); // fallback
 
       var triggerPromiseReactions = function(reactions, x) {
         reactions.forEach(function(reaction) {
@@ -1239,7 +1279,7 @@
           // The `obj` parameter is a hack we use for es5
           // compatibility.
           var prototype = constructor.prototype || Promise$prototype;
-          obj = obj || Object.create(prototype);
+          obj = obj || create(prototype);
           defineProperties(obj, {
             _status: undefined,
             _result: undefined,
@@ -1392,9 +1432,18 @@
     // In Chrome 33 (and thereabouts) Promise is defined, but the
     // implementation is buggy in a number of ways.  Let's check subclassing
     // support to see if we have a buggy implementation.
-    if (!supportsSubclassing(globals.Promise, function(S) {
+    var promiseSupportsSubclassing = supportsSubclassing(globals.Promise, function(S) {
       return S.resolve(42) instanceof S;
-    })) {
+    });
+    var promiseIgnoresNonFunctionThenCallbacks = (function () {
+      try {
+        globals.Promise.reject(42).then(null, 5).then(null, function () {});
+        return true;
+      } catch (ex) {
+        return false;
+      }
+    }());
+    if (!promiseSupportsSubclassing || !promiseIgnoresNonFunctionThenCallbacks) {
       globals.Promise = PromiseShim;
     }
 
@@ -1471,7 +1520,7 @@
           };
           addIterator(MapIterator.prototype);
 
-          function Map() {
+          function Map(iterable) {
             var map = this;
             map = emulateES6construct(map);
             if (!map._es6map) {
@@ -1489,7 +1538,6 @@
             });
 
             // Optionally initialize map from iterable
-            var iterable = arguments[0];
             if (iterable !== undefined && iterable !== null) {
               var it = ES.GetIterator(iterable);
               var adder = map.set;
@@ -1511,7 +1559,7 @@
             '@@create': function(obj) {
               var constructor = this;
               var prototype = constructor.prototype || Map$prototype;
-              obj = obj || Object.create(prototype);
+              obj = obj || create(prototype);
               defineProperties(obj, { _es6map: true });
               return obj;
             }
@@ -1657,7 +1705,7 @@
           // Sets containing only string or numeric keys, we use an object
           // as backing storage and lazily create a full Map only when
           // required.
-          var SetShim = function Set() {
+          var SetShim = function Set(iterable) {
             var set = this;
             set = emulateES6construct(set);
             if (!set._es6set) {
@@ -1670,7 +1718,6 @@
             });
 
             // Optionally initialize map from iterable
-            var iterable = arguments[0];
             if (iterable !== undefined && iterable !== null) {
               var it = ES.GetIterator(iterable);
               var adder = set.add;
@@ -1689,7 +1736,7 @@
             '@@create': function(obj) {
               var constructor = this;
               var prototype = constructor.prototype || Set$prototype;
-              obj = obj || Object.create(prototype);
+              obj = obj || create(prototype);
               defineProperties(obj, { _es6set: true });
               return obj;
             }
@@ -1702,7 +1749,7 @@
               Object.keys(set._storage).forEach(function(k) {
                 // fast check for leading '$'
                 if (k.charCodeAt(0) === 36) {
-                  k = k.substring(1);
+                  k = k.slice(1);
                 } else {
                   k = +k;
                 }
@@ -1806,6 +1853,7 @@
           typeof globals.Map.prototype.clear !== 'function' ||
           new globals.Set().size !== 0 ||
           new globals.Map().size !== 0 ||
+          typeof globals.Map.prototype.keys !== 'function' ||
           typeof globals.Set.prototype.keys !== 'function' ||
           typeof globals.Map.prototype.forEach !== 'function' ||
           typeof globals.Set.prototype.forEach !== 'function' ||
@@ -1825,9 +1873,10 @@
     }
   };
 
-  if (typeof define === 'function' && typeof define.amd === 'object' && define.amd) {
+  if (typeof define === 'function' && define.amd) {
     define(main); // RequireJS
   } else {
     main(); // CommonJS and <script>
   }
 })();
+