Skip to content

Fix #27 - race condition when element style is not set #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pandaiolo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix #27 - race condition when element style is not set #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions angular-deckgrid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@ angular.module('akoenig.deckgrid').factory('DeckgridDescriptor', [

'Deckgrid',
'$templateCache',
'$window',
'$q',

function initialize (Deckgrid, $templateCache) {
function initialize (Deckgrid, $templateCache, $window, $q) {

'use strict';

Expand Down Expand Up @@ -96,7 +98,10 @@ angular.module('akoenig.deckgrid').factory('DeckgridDescriptor', [
*
*/
Descriptor.prototype.$$link = function $$link (scope, elem, attrs, nullController, transclude) {
var templateKey = 'deckgrid/innerHtmlTemplate' + (++this.$$templateKeyIndex);
var templateKey = 'deckgrid/innerHtmlTemplate' + (++this.$$templateKeyIndex),
self = this,
styleReady = $q.defer(),
domWatch;

scope.$on('$destroy', this.$$destroy.bind(this));

Expand Down Expand Up @@ -135,7 +140,19 @@ angular.module('akoenig.deckgrid').factory('DeckgridDescriptor', [

scope.mother = scope.$parent;

this.$$deckgrid = Deckgrid.create(scope, elem[0]);
// Wait for style to be ready on deckgrid element
domWatch = scope.$watch(function() {
return $window.getComputedStyle(elem[0], ':before').content;
}, function(content) {
if (content !== '') {
styleReady.resolve();
// Clear the watcher once element is initialized
domWatch();
}
});
styleReady.promise.then(function() {
self.$$deckgrid = Deckgrid.create(scope, elem[0]);
});
};

return {
Expand Down
2 changes: 1 addition & 1 deletion angular-deckgrid.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 20 additions & 3 deletions src/descriptor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ angular.module('akoenig.deckgrid').factory('DeckgridDescriptor', [

'Deckgrid',
'$templateCache',
'$window',
'$q',

function initialize (Deckgrid, $templateCache) {
function initialize (Deckgrid, $templateCache, $window, $q) {

'use strict';

Expand Down Expand Up @@ -69,7 +71,10 @@ angular.module('akoenig.deckgrid').factory('DeckgridDescriptor', [
*
*/
Descriptor.prototype.$$link = function $$link (scope, elem, attrs, nullController, transclude) {
var templateKey = 'deckgrid/innerHtmlTemplate' + (++this.$$templateKeyIndex);
var templateKey = 'deckgrid/innerHtmlTemplate' + (++this.$$templateKeyIndex),
self = this,
styleReady = $q.defer(),
domWatch;

scope.$on('$destroy', this.$$destroy.bind(this));

Expand Down Expand Up @@ -108,7 +113,19 @@ angular.module('akoenig.deckgrid').factory('DeckgridDescriptor', [

scope.mother = scope.$parent;

this.$$deckgrid = Deckgrid.create(scope, elem[0]);
// Wait for style to be ready on deckgrid element
domWatch = scope.$watch(function() {
return $window.getComputedStyle(elem[0], ':before').content;
}, function(content) {
if (content !== '') {
styleReady.resolve();
// Clear the watcher once element is initialized
domWatch();
}
});
styleReady.promise.then(function() {
self.$$deckgrid = Deckgrid.create(scope, elem[0]);
});
};

return {
Expand Down