Browse Source

Disable infobox shortcut in SmartAlbums

Tobias Reich 11 years ago
parent
commit
f08e838a38
3 changed files with 8 additions and 1 deletions
  1. 1 1
      assets/js/init.js
  2. 7 0
      assets/js/visible.js
  3. 0 0
      assets/min/main.js

+ 1 - 1
assets/js/init.js

@@ -99,7 +99,7 @@ $(document).ready(function(){
 		})
 		.bind(['i', 'ctrl+i'], function() {
 			if (visible.infobox()) view.infobox.hide();
-			else if (!visible.albums()) view.infobox.show();
+			else if (visible.infoboxbutton()) view.infobox.show();
 		})
 		.bind(['command+backspace', 'ctrl+backspace'], function() {
 			if (visible.photo()&&!visible.message()) photo.delete([photo.getID()]);

+ 7 - 0
assets/js/visible.js

@@ -32,6 +32,13 @@ visible = {
 		else return false;
 	},
 
+	infoboxbutton: function() {
+		if (visible.albums()) return false;
+		if (visible.photo()) return true;
+		if (visible.album()&&$('#button_info_album:visible').length>0) return true;
+		else return false;
+	},
+
 	controls: function() {
 		if (lychee.loadingBar.css('opacity')<1) return false;
 		else return true;

File diff suppressed because it is too large
+ 0 - 0
assets/min/main.js


Some files were not shown because too many files changed in this diff