Browse Source

Removed old visible.message()-function

Tobias Reich 8 years ago
parent
commit
4d65819cd9
3 changed files with 5 additions and 9 deletions
  1. 1 1
      src/scripts/header.js
  2. 4 4
      src/scripts/init.js
  3. 0 4
      src/scripts/visible.js

+ 1 - 1
src/scripts/header.js

@@ -80,7 +80,7 @@ header.show = function() {
 
 header.hide = function(e, delay = 500) {
 
-	if (visible.photo() && !visible.sidebar() && !visible.contextMenu() && !visible.message()) {
+	if (visible.photo() && !visible.sidebar() && !visible.contextMenu() && basicModal.visible()===false) {
 
 		clearTimeout($(window).data('timeout'))
 

+ 4 - 4
src/scripts/init.js

@@ -52,12 +52,12 @@ $(document).ready(function() {
 			if (!visible.multiselect()) { sidebar.toggle(); return false }
 		})
 		.bind(['command+backspace', 'ctrl+backspace'], function() {
-			if (visible.photo() && !visible.message())      { photo.delete([photo.getID()]); return false }
-			else if (visible.album() && !visible.message()) { album.delete([album.getID()]); return false }
+			if (visible.photo() && basicModal.visible()===false)      { photo.delete([photo.getID()]); return false }
+			else if (visible.album() && basicModal.visible()===false) { album.delete([album.getID()]); return false }
 		})
 		.bind(['command+a', 'ctrl+a'], function() {
-			if (visible.album() && !visible.message())       { multiselect.selectAll(); return false }
-			else if (visible.albums() && !visible.message()) { multiselect.selectAll(); return false }
+			if (visible.album() && basicModal.visible()===false)       { multiselect.selectAll(); return false }
+			else if (visible.albums() && basicModal.visible()===false) { multiselect.selectAll(); return false }
 		})
 
 	Mousetrap.bindGlobal('enter', function() {

+ 0 - 4
src/scripts/visible.js

@@ -41,10 +41,6 @@ visible.header = function() {
 	return true
 }
 
-visible.message = function() {
-	return basicModal.visible()
-}
-
 visible.contextMenu = function() {
 	return basicContext.visible()
 }