Skip to content

Support for smooth rendering on scroll #76

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
orrgal1 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Support for smooth rendering on scroll #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a79d80
..
orrgal1 Mar 24, 2015
505bb41
added more smooth support for infinite scrolling
orrgal1 Mar 24, 2015
91d3e11
Merge branch 'master' of github.com:orrgal1/angular-deckgrid
orrgal1 Mar 24, 2015
5150209
added track by to avoid ng-repeat errors
orrgal1 Mar 25, 2015
9aceb78
add cards was crashing if less columns then possible were created ini…
orrgal1 Mar 29, 2015
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
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ Do you use the `angular-deckgrid` and would like to be featured here? Just send

- [raindrop.io](http://raindrop.io/): "Smart bookmarks - A beautiful way to remember the most important"
- [infowrap.com](https://www.infowrap.com/): "An infowrap is engineered to hold everything people need together on a single page and keep them up to date."
- [theonegenerator.com](http://www.theonegenerator.com/): "This webapp is designed to any user in need of randomly generated data for testing cases, gaming and lottery spins."

## Changelog

Expand Down
107 changes: 74 additions & 33 deletions angular-deckgrid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ angular.module('akoenig.deckgrid').directive('deckgrid', [

'DeckgridDescriptor',

function initialize (DeckgridDescriptor) {
function initialize(DeckgridDescriptor) {

'use strict';

Expand All @@ -43,7 +43,7 @@ angular.module('akoenig.deckgrid').factory('DeckgridDescriptor', [
'Deckgrid',
'$templateCache',

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

'use strict';

Expand All @@ -52,12 +52,12 @@ angular.module('akoenig.deckgrid').factory('DeckgridDescriptor', [
* directive description object.
*
*/
function Descriptor () {
function Descriptor() {
this.restrict = 'AE';

this.template = '<div data-ng-repeat="column in columns" class="{{layout.classList}}">' +
'<div data-ng-repeat="card in column" data-ng-include="cardTemplate"></div>' +
'</div>';
'<div data-ng-repeat="card in column track by $index" data-ng-include="cardTemplate"></div>' +
'</div>';

this.scope = {
'model': '=source'
Expand Down Expand Up @@ -85,7 +85,7 @@ angular.module('akoenig.deckgrid').factory('DeckgridDescriptor', [
* deckgrid directive should be destroyed.
*
*/
Descriptor.prototype.$$destroy = function $$destroy () {
Descriptor.prototype.$$destroy = function $$destroy() {
this.$$deckgrid.destroy();
};

Expand All @@ -95,15 +95,15 @@ angular.module('akoenig.deckgrid').factory('DeckgridDescriptor', [
* The deckgrid link method. Will instantiate the deckgrid.
*
*/
Descriptor.prototype.$$link = function $$link (scope, elem, attrs, nullController, transclude) {
Descriptor.prototype.$$link = function $$link(scope, elem, attrs, nullController, transclude) {
var templateKey = 'deckgrid/innerHtmlTemplate' + (++this.$$templateKeyIndex) + '.html';

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

if (angular.isUndefined(attrs.cardtemplate)) {
if (angular.isUndefined(attrs.cardtemplatestring)) {
// use the provided inner html as template
transclude(scope, function onTransclude (innerHTML) {
transclude(scope, function onTransclude(innerHTML) {
var extractedInnerHTML = [],
i = 0,
len = innerHTML.length,
Expand Down Expand Up @@ -139,7 +139,7 @@ angular.module('akoenig.deckgrid').factory('DeckgridDescriptor', [
};

return {
create : function create () {
create: function create() {
return new Descriptor();
}
};
Expand All @@ -164,15 +164,15 @@ angular.module('akoenig.deckgrid').factory('Deckgrid', [
'$window',
'$log',

function initialize ($window, $log) {
function initialize($window, $log) {

'use strict';

/**
* The deckgrid directive.
*
*/
function Deckgrid (scope, element) {
function Deckgrid(scope, element) {
var self = this,
watcher,
mql;
Expand Down Expand Up @@ -202,18 +202,18 @@ angular.module('akoenig.deckgrid').factory('Deckgrid', [
//
// Register media query change events.
//
angular.forEach(self.$$getMediaQueries(), function onIteration (rule) {
angular.forEach(self.$$getMediaQueries(), function onIteration(rule) {
var handler = self.$$onMediaQueryChange.bind(self);

function onDestroy () {
function onDestroy() {
rule.removeListener(handler);
}

rule.addListener(handler);

self.$$watchers.push(onDestroy);
});

mql = $window.matchMedia('(orientation: portrait)');
mql.addListener(self.$$onMediaQueryChange.bind(self));

Expand All @@ -230,7 +230,7 @@ angular.module('akoenig.deckgrid').factory('Deckgrid', [
* @return {array} An array with all respective styles.
*
*/
Deckgrid.prototype.$$getMediaQueries = function $$getMediaQueries () {
Deckgrid.prototype.$$getMediaQueries = function $$getMediaQueries() {
var stylesheets = [],
mediaQueries = [];

Expand All @@ -239,17 +239,17 @@ angular.module('akoenig.deckgrid').factory('Deckgrid', [
Array.prototype.slice.call(document.querySelectorAll('link[rel=\'stylesheet\']'))
);

function extractRules (stylesheet) {
function extractRules(stylesheet) {
try {
return (stylesheet.sheet.cssRules || []);
} catch (e) {
return [];
}
}

function hasDeckgridStyles (rule) {
var regexe = /\[(\w*-)?deckgrid\]::?before/g,
i = 0,
function hasDeckgridStyles(rule) {
var regexe = /\[(\w*-)?deckgrid\]::?before/g,
i = 0,
selector = '';

if (!rule.media || angular.isUndefined(rule.cssRules)) {
Expand All @@ -269,10 +269,10 @@ angular.module('akoenig.deckgrid').factory('Deckgrid', [
return false;
}

angular.forEach(stylesheets, function onIteration (stylesheet) {
angular.forEach(stylesheets, function onIteration(stylesheet) {
var rules = extractRules(stylesheet);

angular.forEach(rules, function inRuleIteration (rule) {
angular.forEach(rules, function inRuleIteration(rule) {
if (hasDeckgridStyles(rule)) {
mediaQueries.push($window.matchMedia(rule.media.mediaText));
}
Expand All @@ -295,18 +295,20 @@ angular.module('akoenig.deckgrid').factory('Deckgrid', [
* NOTE that calling this method will trigger a complete template "redraw".
*
*/
Deckgrid.prototype.$$createColumns = function $$createColumns () {
Deckgrid.prototype.$$createColumns = function $$createColumns() {
var self = this;

if (!this.$$scope.layout) {
return $log.error('angular-deckgrid: No CSS configuration found (see ' +
'https://github.com/akoenig/angular-deckgrid#the-grid-configuration)');
'https://github.com/akoenig/angular-deckgrid#the-grid-configuration)');
}

this.$$scope.columns = [];

angular.forEach(this.$$scope.model, function onIteration (card, index) {
var lastUsedColumn=0;
angular.forEach(this.$$scope.model, function onIteration(card, index) {
var column = (index % self.$$scope.layout.columns) | 0;
lastUsedColumn=column;

if (!self.$$scope.columns[column]) {
self.$$scope.columns[column] = [];
Expand All @@ -315,6 +317,35 @@ angular.module('akoenig.deckgrid').factory('Deckgrid', [
card.$index = index;
self.$$scope.columns[column].push(card);
});
self.$$scope.lastUsedColumn=lastUsedColumn;
};

/**
* @private
*
* Add cards to the grid without a complete redraw
*
*/
Deckgrid.prototype.$$addCards = function $$addCards(newCards) {
var self = this;

if (!this.$$scope.layout) {
return $log.error('angular-deckgrid: No CSS configuration found (see ' +
'https://github.com/akoenig/angular-deckgrid#the-grid-configuration)');
}

var lastUsedColumn=0;
angular.forEach(newCards, function onIteration(card, index) {
index+=self.$$scope.lastUsedColumn+1;
var column = (index % self.$$scope.layout.columns) | 0;
lastUsedColumn=column;
card.$index = index;
if (!self.$$scope.columns[column]) {
self.$$scope.columns[column] = [];
}
self.$$scope.columns[column].push(card);
});
self.$$scope.lastUsedColumn=lastUsedColumn;
};

/**
Expand All @@ -334,7 +365,7 @@ angular.module('akoenig.deckgrid').factory('Deckgrid', [
* You are responsible for defining the respective styles within your CSS.
*
*/
Deckgrid.prototype.$$getLayout = function $$getLayout () {
Deckgrid.prototype.$$getLayout = function $$getLayout() {
var content = $window.getComputedStyle(this.$$elem, ':before').content,
layout;

Expand All @@ -359,7 +390,7 @@ angular.module('akoenig.deckgrid').factory('Deckgrid', [
* Event that will be triggered if a CSS media query changed.
*
*/
Deckgrid.prototype.$$onMediaQueryChange = function $$onMediaQueryChange () {
Deckgrid.prototype.$$onMediaQueryChange = function $$onMediaQueryChange() {
var self = this,
layout = this.$$getLayout();

Expand All @@ -370,7 +401,7 @@ angular.module('akoenig.deckgrid').factory('Deckgrid', [
if (layout.columns !== this.$$scope.layout.columns) {
self.$$scope.layout = layout;

self.$$scope.$apply(function onApply () {
self.$$scope.$apply(function onApply() {
self.$$createColumns();
});
}
Expand All @@ -382,14 +413,24 @@ angular.module('akoenig.deckgrid').factory('Deckgrid', [
* Event that will be triggered when the source model has changed.
*
*/
Deckgrid.prototype.$$onModelChange = function $$onModelChange (newModel, oldModel) {
Deckgrid.prototype.$$onModelChange = function $$onModelChange(newModel, oldModel) {
var self = this;

newModel = newModel || [];
oldModel = oldModel || [];
var newModel = newModel || [];
var oldModel = oldModel || [];

if (!angular.equals(oldModel, newModel)) {
//if first time draw from scratch
if (oldModel.length == 0) {
self.$$createColumns();
} else {
//get a collection of the new cards and add them to grid without redrawing
if (!angular.equals(oldModel, newModel) && newModel.length > oldModel.length) {
var currentIdx = oldModel.length-1;
var newCards = $.grep(newModel, function (card, idx) {
return idx > currentIdx;
});
self.$$addCards(newCards);
}
}
};

Expand All @@ -398,7 +439,7 @@ angular.module('akoenig.deckgrid').factory('Deckgrid', [
* watchers and event handlers.
*
*/
Deckgrid.prototype.destroy = function destroy () {
Deckgrid.prototype.destroy = function destroy() {
var i = this.$$watchers.length - 1;

for (i; i >= 0; i = i - 1) {
Expand All @@ -407,7 +448,7 @@ angular.module('akoenig.deckgrid').factory('Deckgrid', [
};

return {
create : function create (scope, element) {
create: function create(scope, element) {
return new Deckgrid(scope, element);
}
};
Expand Down