ember-data.prod.js in ember-data-source-2.6.2

- old
+ new

@@ -4,11 +4,11 @@
 /*!
  * @overview  Ember Data
  * @copyright Copyright 2011-2016 Tilde Inc. and contributors.
  *            Portions Copyright 2011 LivingSocial Inc.
  * @license   Licensed under MIT license (see license.js)
- * @version   2.6.1
+ * @version   2.6.2
  */
 
 var loader, define, requireModule, require, requirejs;
 
 (function(global) {
@@ -44,15 +44,17 @@
       modules: 0,
       exports: 0,
       resolve: 0,
       resolveRelative: 0,
       findModule: 0,
+      pendingQueueLength: 0
     };
     requirejs._stats = stats;
   }
 
   var stats;
+
   resetStats();
 
   loader = {
     noConflict: function(aliases) {
       var oldName, newName;
@@ -90,21 +92,22 @@
   }
 
   var defaultDeps = ['require', 'exports', 'module'];
 
   function Module(name, deps, callback, alias) {
-    stats.modules ++;
+    stats.modules++;
     this.id        = uuid++;
     this.name      = name;
     this.deps      = !deps.length && callback.length ? defaultDeps : deps;
     this.module    = { exports: {} };
     this.callback  = callback;
     this.finalized = false;
     this.hasExportsAsDep = false;
     this.isAlias = alias;
     this.reified = new Array(deps.length);
     this._foundDeps = false;
+    this.isPending = false;
   }
 
   Module.prototype.makeDefaultExport = function() {
     var exports = this.module.exports;
     if (exports !== null &&
@@ -117,10 +120,11 @@
   Module.prototype.exports = function() {
     if (this.finalized) { return this.module.exports; }
     stats.exports++;
 
     this.finalized = true;
+    this.isPending = false;
 
     if (loader.wrapModules) {
       this.callback = loader.wrapModules(this.name, this.callback);
     }
 
@@ -136,10 +140,11 @@
   };
 
   Module.prototype.unsee = function() {
     this.finalized = false;
     this._foundDeps = false;
+    this.isPending = false;
     this.module = { exports: {}};
   };
 
   Module.prototype.reify = function() {
     stats.reify++;
@@ -155,10 +160,11 @@
       return;
     }
 
     stats.findDeps++;
     this._foundDeps = true;
+    this.isPending = true;
 
     var deps = this.deps;
 
     for (var i = 0; i < deps.length; i++) {
       var dep = deps[i];
@@ -231,13 +237,14 @@
       mod = registry[mod.name];
     }
 
     if (!mod) { missingModule(name, referrer); }
 
-    if (pending) {
+    if (pending && !mod.finalized && !mod.isPending) {
       mod.findDeps(pending);
       pending.push(mod);
+      stats.pendingQueueLength++;
     }
     return mod;
   }
 
   function resolve(child, name) {
@@ -16336,11 +16343,11 @@
     */
     deserialize: null
   });
 });
 define("ember-data/version", ["exports"], function (exports) {
-  exports.default = "2.6.1";
+  exports.default = "2.6.2";
 });
 define("ember-inflector", ["exports", "ember", "ember-inflector/lib/system", "ember-inflector/lib/ext/string"], function (exports, _ember, _emberInflectorLibSystem, _emberInflectorLibExtString) {
 
   _emberInflectorLibSystem.Inflector.defaultRules = _emberInflectorLibSystem.defaultRules;
   _ember.default.Inflector = _emberInflectorLibSystem.Inflector;
@@ -16731,19 +16738,19 @@
 
       if (isUncountable) {
         return word;
       }
 
-      for (rule in this.rules.irregular) {
+      for (rule in irregular) {
         if (lowercase.match(rule + "$")) {
           substitution = irregular[rule];
 
           if (isCamelized && irregular[lastWord]) {
             substitution = capitalize(substitution);
             rule = capitalize(rule);
           }
 
-          return word.replace(rule, substitution);
+          return word.replace(new RegExp(rule, 'i'), substitution);
         }
       }
 
       for (var i = typeRules.length, min = 0; i > min; i--) {
         inflection = typeRules[i - 1];