Skip to content
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

Jump to bottom

Fixed row height optimization #221

Open
wants to merge 20 commits into
base: fixed-height-optimization
Choose a base branch
from
Open

Fixed row height optimization #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
61cb0cc
Added a row height parameter
priandsf Jun 4, 2019
bedd378
Made $digest optional in processUpdates() when the row height is fixed
priandsf Jun 4, 2019
71c2f33
fixedRowHeight demo
dhilt Jun 5, 2019
8f4bece
release processUpdates
dhilt Jun 5, 2019
551bff3
Separated visbiility watch & row height. Added "allow-visibility-watc…
priandsf Jun 6, 2019
43561dd
Looks like the source was not properly commited - changed ui-scroll
priandsf Jun 17, 2019
d183273
jquery load demo
dhilt Jun 19, 2019
62c8bc6
v1.7.4 release
dhilt Jun 19, 2019
fdcca3d
v1.7.4 build
dhilt Jun 19, 2019
b1be940
Fix the outerHeight calculation in buffer when rowHeight is provided
priandsf Jun 21, 2019
45a8387
Merge branch 'master' of github.com:angular-ui/ui-scroll into Added-s…
priandsf Jun 21, 2019
95a6d4a
Reverted bad commit on demo/fixedRowHeight for test purposes
priandsf Jun 21, 2019
359d905
fix lodash dependency vulnerability
dhilt Jul 16, 2019
b174ffc
gh-pages auto deploy
dhilt Jul 16, 2019
0b62060
travis.iml updates
dhilt Jul 16, 2019
bbc1a74
Added unbindEvent() to reload.
priandsf Jul 31, 2019
dd3bdfc
Support for row-height
priandsf Aug 16, 2019
3cff84e
Merge branch 'master' into Added-static-row-height
priandsf Aug 16, 2019
07e7047
compiled files
priandsf Aug 16, 2019
9c26d38
Latest code dealing with row height.
priandsf Aug 26, 2019
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
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,9 @@ Pull Rerquest should include source code (./scr) changes, may include tests (./t

## Change log

### v1.7.4
* Fixed jqLite/jQuery confrontation.

### v1.7.3
* Fixed some html-attributes and Adapter.reload argument parsing.

Expand Down
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "angular-ui-scroll",
"description": "AngularJS infinite scrolling module",
"version": "1.7.3",
"version": "1.7.4",
"main": "./dist/ui-scroll.js",
"homepage": "https://github.com/angular-ui/ui-scroll.git",
"license": "MIT",
Expand Down
322 changes: 161 additions & 161 deletions demo/adapterSync/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,161 +1,161 @@
angular.module('server', []).factory('Server',
['$timeout', '$q', function ($timeout, $q) {
var ServerFactory = {
firstIndex: 1,
lastIndex: 40,
delay: 100,
data: [],
absIndex: 1,
generateId: function () {
var d = '-';
function S4() {
return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
}
return (S4() + S4() + d + S4() + d + S4() + d + S4() + d + S4() + S4() + S4());
},
generateItem: function (index) {
return {
index: index,
id: this.generateId(),
content: 'Item #' + this.absIndex++
}
},
init: function () {
for (var i = this.firstIndex; i <= this.lastIndex; i++) {
this.data.push(this.generateItem(i));
}
},
getItem: function (index) {
for (var i = this.data.length - 1; i >= 0; i--) {
if (this.data[i].index === index) {
return this.data[i];
}
}
},
returnDeferredResult: function (result) {
var deferred = $q.defer();
$timeout(function () {
deferred.resolve(result);
}, this.delay);
return deferred.promise;
},
request: function (index, count) {
var start = index;
var end = index + count - 1;
var item, result = {
items: []
};
if (start <= end) {
for (var i = start; i <= end; i++) {
if (item = this.getItem(i)) {
result.items.push(item);
}
}
}
return this.returnDeferredResult(result);
},
prependItem: function (params) {
var newItem = this.generateItem(--this.firstIndex);
newItem.content += params;
this.data.unshift(newItem);
return this.returnDeferredResult(newItem);
},
appendItem: function (params) {
var newItem = this.generateItem(++this.lastIndex);
newItem.content += params;
this.data.push(newItem);
return this.returnDeferredResult(newItem);
},
removeFirst: function () {
var firstItem = this.data.find(i => i.index === this.firstIndex);
if(!firstItem) {
return $q.reject();
}
return this.removeItemById(firstItem.id);
},
removeLast: function () {
var lastItem = this.data.find(i => i.index === this.lastIndex);
if(!lastItem) {
return $q.reject();
}
return this.removeItemById(lastItem.id);
},
removeItemById: function (itemId) {
var length = this.data.length;
for (var i = 0; i < length; i++) {
if (this.data[i].id === itemId) {
var indexRemoved = this.data[i].index;
if(indexRemoved > this.firstIndex) {
for (var j = i; j < length; j++) {
this.data[j].index--;
}
}
this.data.splice(i, 1);
this.setIndices();
return this.returnDeferredResult(indexRemoved);
}
}
return this.returnDeferredResult(false);
},
insertAfterIndex: function (index, params) {
if(index < this.firstIndex || index > this.lastIndex) {
return this.returnDeferredResult(null);
}
var length = this.data.length, item;
for (var i = 0; i < length; i++) {
if (this.data[i].index === index) {
for (var j = i + 1; j < length; j++) {
this.data[j].index++;
}
item = this.generateItem(index + 1);
item.content += params;
this.data.splice(i + 1, 0, item);
this.setIndices();
return this.returnDeferredResult(item);
}
}
return this.returnDeferredResult(null);
},
setIndices: function () {
if(!this.data.length) {
this.firstIndex = 1;
this.lastIndex = 1;
return;
}
this.firstIndex = this.data[0].index;
this.lastIndex = this.data[0].index;
for (var i = this.data.length - 1; i >= 0; i--) {
if(this.data[i].index > this.lastIndex) {
this.lastIndex = this.data[i].index;
}
if(this.data[i].index < this.firstIndex) {
this.firstIndex = this.data[i].index;
}
}
}
};
ServerFactory.init();
return ServerFactory;
}
]);
angular.module('server', []).factory('Server',
['$timeout', '$q', function ($timeout, $q) {

var ServerFactory = {

firstIndex: 1,

lastIndex: 40,

delay: 100,

data: [],

absIndex: 1,

generateId: function () {
var d = '-';
function S4() {
return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
}
return (S4() + S4() + d + S4() + d + S4() + d + S4() + d + S4() + S4() + S4());
},

generateItem: function (index) {
return {
index: index,
id: this.generateId(),
content: 'Item #' + this.absIndex++
}
},

init: function () {
for (var i = this.firstIndex; i <= this.lastIndex; i++) {
this.data.push(this.generateItem(i));
}
},

getItem: function (index) {
for (var i = this.data.length - 1; i >= 0; i--) {
if (this.data[i].index === index) {
return this.data[i];
}
}
},

returnDeferredResult: function (result) {
var deferred = $q.defer();
$timeout(function () {
deferred.resolve(result);
}, this.delay);
return deferred.promise;
},

request: function (index, count) {
var start = index;
var end = index + count - 1;
var item, result = {
items: []
};
if (start <= end) {
for (var i = start; i <= end; i++) {
if (item = this.getItem(i)) {
result.items.push(item);
}
}
}
return this.returnDeferredResult(result);
},

prependItem: function (params) {
var newItem = this.generateItem(--this.firstIndex);
newItem.content += params;
this.data.unshift(newItem);
return this.returnDeferredResult(newItem);
},

appendItem: function (params) {
var newItem = this.generateItem(++this.lastIndex);
newItem.content += params;
this.data.push(newItem);
return this.returnDeferredResult(newItem);
},

removeFirst: function () {
var firstItem = this.data.find(i => i.index === this.firstIndex);
if(!firstItem) {
return $q.reject();
}
return this.removeItemById(firstItem.id);
},

removeLast: function () {
var lastItem = this.data.find(i => i.index === this.lastIndex);
if(!lastItem) {
return $q.reject();
}
return this.removeItemById(lastItem.id);
},

removeItemById: function (itemId) {
var length = this.data.length;
for (var i = 0; i < length; i++) {
if (this.data[i].id === itemId) {
var indexRemoved = this.data[i].index;
if(indexRemoved > this.firstIndex) {
for (var j = i; j < length; j++) {
this.data[j].index--;
}
}
this.data.splice(i, 1);
this.setIndices();
return this.returnDeferredResult(indexRemoved);
}
}
return this.returnDeferredResult(false);
},

insertAfterIndex: function (index, params) {
if(index < this.firstIndex || index > this.lastIndex) {
return this.returnDeferredResult(null);
}
var length = this.data.length, item;
for (var i = 0; i < length; i++) {
if (this.data[i].index === index) {
for (var j = i + 1; j < length; j++) {
this.data[j].index++;
}
item = this.generateItem(index + 1);
item.content += params;
this.data.splice(i + 1, 0, item);
this.setIndices();
return this.returnDeferredResult(item);
}
}
return this.returnDeferredResult(null);
},

setIndices: function () {
if(!this.data.length) {
this.firstIndex = 1;
this.lastIndex = 1;
return;
}
this.firstIndex = this.data[0].index;
this.lastIndex = this.data[0].index;
for (var i = this.data.length - 1; i >= 0; i--) {
if(this.data[i].index > this.lastIndex) {
this.lastIndex = this.data[i].index;
}
if(this.data[i].index < this.firstIndex) {
this.firstIndex = this.data[i].index;
}
}
}
};

ServerFactory.init();

return ServerFactory;
}
]);
Loading