Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
yotta
/
pictogram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
60
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
ee8d0a2e
authored
Feb 15, 2017
by
Jose Antonio
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Issue #920, disable infinite scroll in ownpictos
parent
0c68ed09
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
sails/src/assets/scripts/modules/student/controllers/addpicto.js
sails/src/assets/scripts/modules/student/controllers/addpicto.js
View file @
ee8d0a2e
...
@@ -295,8 +295,8 @@ dashboardControllers.controller('AddPictoCtrl', function (
...
@@ -295,8 +295,8 @@ dashboardControllers.controller('AddPictoCtrl', function (
//Triggered when scrolling to bottom
//Triggered when scrolling to bottom
$scope
.
scroll
=
function
(){
$scope
.
scroll
=
function
(){
if
(
$scope
.
onlyOwn
)
if
(
$scope
.
onlyOwn
||
$scope
.
source
==
'ownpictos'
)
return
;
return
;
//When ownpictos is active, load whole own pictos at once
$scope
.
loadingCatPictos
=
true
;
$scope
.
loadingCatPictos
=
true
;
$scope
.
page
+=
1
;
$scope
.
page
+=
1
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment