arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replaced lychee.goto('') with lychee.goto()

Browse Source
This commit is contained in:
Tobias Reich 2016-03-06 18:19:27 +01:00
parent c594210579
commit 20963ac463
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/scripts/album.js
View File

@ -55,7 +55,7 @@ album.load = function(albumID, refresh = false) {
} else { } else {
// Album not public // Album not public
lychee.content.show() lychee.content.show()
lychee.goto('') lychee.goto()
} }
return false return false
} }
@ -178,7 +178,7 @@ album.delete = function(albumIDs) {
} else { } else {
albums.refresh() albums.refresh()
lychee.goto('') lychee.goto()
} }

2
src/scripts/header.js
View File

@ -52,7 +52,7 @@ header.bind = function() {
header.dom('#button_trash') .on(eventName, function() { photo.delete([ photo.getID() ]) }) header.dom('#button_trash') .on(eventName, function() { photo.delete([ photo.getID() ]) })
header.dom('#button_archive') .on(eventName, function() { album.getArchive(album.getID()) }) header.dom('#button_archive') .on(eventName, function() { album.getArchive(album.getID()) })
header.dom('#button_star') .on(eventName, function() { photo.setStar([ photo.getID() ]) }) header.dom('#button_star') .on(eventName, function() { photo.setStar([ photo.getID() ]) })
header.dom('#button_back_home') .on(eventName, function() { lychee.goto('') }) header.dom('#button_back_home') .on(eventName, function() { lychee.goto() })
header.dom('#button_back') .on(eventName, function() { lychee.goto(album.getID()) }) header.dom('#button_back') .on(eventName, function() { lychee.goto(album.getID()) })
header.dom('.header__search').on('keyup click', function() { search.find($(this).val()) }) header.dom('.header__search').on('keyup click', function() { search.find($(this).val()) })

2
src/scripts/init.js
View File

@ -68,7 +68,7 @@ $(document).ready(function() {
if (basicModal.visible()===true) basicModal.cancel() if (basicModal.visible()===true) basicModal.cancel()
else if (visible.contextMenu()) contextMenu.close() else if (visible.contextMenu()) contextMenu.close()
else if (visible.photo()) lychee.goto(album.getID()) else if (visible.photo()) lychee.goto(album.getID())
else if (visible.album()) lychee.goto('') else if (visible.album()) lychee.goto()
else if (visible.albums() && header.dom('.header__search').val().length!==0) search.reset() else if (visible.albums() && header.dom('.header__search').val().length!==0) search.reset()
return false return false
}) })

5
src/scripts/lychee.js
View File

@ -156,10 +156,9 @@ lychee.logout = function() {
} }
lychee.goto = function(url) { lychee.goto = function(url = '') {
if (url===undefined) url = '#' url = '#' + url
else url = '#' + url
history.pushState(null, null, url) history.pushState(null, null, url)
lychee.load() lychee.load()

2
src/scripts/upload.js
View File

@ -386,7 +386,7 @@ upload.start = {
// Go back to the album overview to show the imported albums // Go back to the album overview to show the imported albums
if (visible.albums()) lychee.load() if (visible.albums()) lychee.load()
else lychee.goto('') else lychee.goto()
basicModal.close() basicModal.close()