ember-infinity
Advanced tools
Comparing version 1.2.4 to 1.2.5
@@ -26,3 +26,3 @@ import InViewportMixin from 'ember-in-viewport'; | ||
*/ | ||
loadingText: 'Loading Infinite Model...', | ||
loadingText: 'Loading Infinity Model...', | ||
/** | ||
@@ -32,3 +32,3 @@ * @public | ||
*/ | ||
loadedText: 'Infinite Model Entirely Loaded.', | ||
loadedText: 'Infinity Model Entirely Loaded.', | ||
/** | ||
@@ -102,2 +102,4 @@ * @public | ||
})); | ||
this.addObserver('infinityModel', this, this._initialInfinityModelSetup); | ||
}, | ||
@@ -114,7 +116,5 @@ | ||
this._loadStatusDidChange(); | ||
get(this, 'infinityModelContent') | ||
.then((infinityModel) => { | ||
infinityModel.on('infinityModelLoaded', this, this._loadStatusDidChange); | ||
set(infinityModel, '_scrollable', get(this, 'scrollable')); | ||
}); | ||
this._initialInfinityModelSetup(); | ||
this.addObserver('hideOnInfinity', this, this._loadStatusDidChange); | ||
@@ -125,3 +125,5 @@ }, | ||
this._super(...arguments); | ||
this._cancelTimers(); | ||
get(this, 'infinityModelContent') | ||
@@ -131,2 +133,4 @@ .then((infinityModel) => { | ||
}); | ||
this.removeObserver('infinityModel', this, this._initialInfinityModelSetup); | ||
this.removeObserver('hideOnInfinity', this, this._loadStatusDidChange); | ||
@@ -166,4 +170,16 @@ }, | ||
/** | ||
* @method loadedStatusDidChange | ||
* @method _initialInfinityModelSetup | ||
*/ | ||
_initialInfinityModelSetup() { | ||
get(this, 'infinityModelContent') | ||
.then((infinityModel) => { | ||
infinityModel.on('infinityModelLoaded', this, this._loadStatusDidChange); | ||
set(infinityModel, '_scrollable', get(this, 'scrollable')); | ||
set(this, 'isDoneLoading', false); | ||
}); | ||
}, | ||
/** | ||
* @method _loadStatusDidChange | ||
*/ | ||
_loadStatusDidChange() { | ||
@@ -170,0 +186,0 @@ get(this, 'infinityModelContent') |
{ | ||
"name": "ember-infinity", | ||
"version": "1.2.4", | ||
"version": "1.2.5", | ||
"description": "Simple, flexible infinite scroll for Ember CLI Apps.", | ||
@@ -5,0 +5,0 @@ "keywords": [ |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
87178
969