bem-promised-models
Advanced tools
Comparing version 0.0.19 to 0.0.20
@@ -302,2 +302,3 @@ (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){ | ||
this._eventEmitter = new EventEmitter(); | ||
this._ready = true; | ||
this._readyPromise = fulfill(); | ||
@@ -580,3 +581,3 @@ this.storage = new Storage(); | ||
isReady: function () { | ||
return this._readyPromise.isResolved(); | ||
return this._ready; | ||
}, | ||
@@ -589,11 +590,3 @@ | ||
ready: function () { | ||
var model = this; | ||
return model._readyPromise.always(function (p) { | ||
//promise not changed or rejected | ||
if (model._readyPromise === p) { | ||
return p; | ||
} else { | ||
return model.ready(); | ||
} | ||
}); | ||
return this._readyPromise; | ||
}, | ||
@@ -608,2 +601,3 @@ | ||
if (this.isReady()) { | ||
this._ready = false; | ||
this.trigger('calculate'); | ||
@@ -614,2 +608,5 @@ //start _calculate on next tick | ||
}); | ||
this._readyPromise.fail(function () { | ||
model._ready = true; | ||
}).done(); | ||
} else { | ||
@@ -652,2 +649,5 @@ this._requireMoreCalculations = true; | ||
this._requireMoreCalculations = false; | ||
this._ready = false; | ||
if (n >= model.maxCalculations) { | ||
@@ -678,3 +678,2 @@ return model._throwCalculationLoop(); | ||
model._setCalculatedData(calculateData); | ||
// model.set(calculateData); | ||
if (model._checkContinueCalculations()) { | ||
@@ -689,2 +688,3 @@ return model._calculate(++n); | ||
} | ||
model._ready = true; | ||
}); | ||
@@ -691,0 +691,0 @@ }, |
{ | ||
"description": "BEM wrapper for promised-models", | ||
"name": "bem-promised-models", | ||
"version": "0.0.19", | ||
"version": "0.0.20", | ||
"repository": "git@github.com:delfrrr/bem-promised-models.git", | ||
@@ -31,3 +31,3 @@ "keywords": [ | ||
"dependencies": { | ||
"promised-models": "0.0.17" | ||
"promised-models": "0.0.18" | ||
}, | ||
@@ -34,0 +34,0 @@ "devDependencies": { |
56658
1701
+ Addedpromised-models@0.0.18(transitive)
- Removedpromised-models@0.0.17(transitive)
Updatedpromised-models@0.0.18