[cmd:help] show "Preferences" button when missing button on the toolbar

Re fix #2118 - (#2118 (comment))
Studio-42 · Aug 3, 2017 · 6cf34da · 6cf34da
1 parent a1cba08
commit 6cf34da
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 5 deletions.
diff --git a/css/toolbar.css b/css/toolbar.css
@@ -156,11 +156,11 @@
 .elfinder-button-icon-menu      { background-position: 0 -752px; }
 .elfinder-button-icon-colwidth  { background-position: 0 -768px; }
 .elfinder-button-icon-fullscreen  { background-position: 0 -784px; }
-.elfinder-button-icon-unfullscreen{ background-position: 0 -800px; }
+.elfinder-button-icon-unfullscreen { background-position: 0 -800px; }
 .elfinder-button-icon-empty     { background-position: 0 -848px; }
 .elfinder-button-icon-undo      { background-position: 0 -864px; }
 .elfinder-button-icon-redo      { background-position: 0 -880px; }
-.elfinder-button-icon-pref      { background-position: 0 -896px; }
+.elfinder-button-icon-preference { background-position: 0 -896px; }
 
 /* button with dropdown menu*/
 .elfinder .elfinder-menubutton { overflow:visible; }

diff --git a/js/commands/help.js b/js/commands/help.js
@@ -274,6 +274,11 @@
 			parts = self.options.view || ['about', 'shortcuts', 'help', 'preference', 'debug'],
 			tabDebug, i, helpSource, tabBase, tabNav, tabs, delta;
 
+		// force enable 'preference' tab
+		if ($.inArray('preference') === -1) {
+			parts.push('preference');
+		}
+
 		// debug tab require jQueryUI Tabs Widget
 		if (! $.fn.tabs) {
 			if ((i = $.inArray(parts, 'debug')) !== false) {
@@ -396,3 +401,17 @@
 	};
 
 }).prototype = { forceLoad : true }; // this is required command
+
+elFinder.prototype.commands.preference = function() {
+
+	this.linkedCmds = ['help'];
+	this.alwaysEnabled  = true;
+
+	this.getstate = function() {
+		return 0;
+	};
+
+	this.exec = function() {
+		this.fm.exec('help', void(0), {tab: 'preference'});
+	};};
+
diff --git a/js/i18n/elfinder.LANG.js b/js/i18n/elfinder.LANG.js
@@ -164,6 +164,7 @@
 			'cmdempty'     : 'Empty the folder', // from v2.1.25 added 22.06.2017
 			'cmdundo'      : 'Undo', // from v2.1.27 added 31.07.2017
 			'cmdredo'      : 'Redo', // from v2.1.27 added 31.07.2017
+			'cmdpreference': 'Preferences', // from v2.1.27 added 03.08.2017
 
 			/*********************************** buttons ***********************************/
 			'btnClose'  : 'Close',

diff --git a/js/i18n/elfinder.en.js b/js/i18n/elfinder.en.js
@@ -2,7 +2,7 @@
  * English translation
  * @author Troex Nevelin <troex@fury.scancode.ru>
  * @author Naoki Sawada <hypweb@gmail.com>
- * @version 2017-08-02
+ * @version 2017-08-03
  */
 // elfinder.en.js is integrated into elfinder.(full|min).js by jake build
 if (typeof elFinder === 'function' && elFinder.prototype.i18) {
@@ -151,6 +151,7 @@ if (typeof elFinder === 'function' && elFinder.prototype.i18) {
 			'cmdempty'     : 'Empty the folder', // from v2.1.25 added 22.06.2017
 			'cmdundo'      : 'Undo', // from v2.1.27 added 31.07.2017
 			'cmdredo'      : 'Redo', // from v2.1.27 added 31.07.2017
+			'cmdpreference': 'Preferences', // from v2.1.27 added 03.08.2017
 
 			/*********************************** buttons ***********************************/
 			'btnClose'  : 'Close',

diff --git a/js/i18n/elfinder.jp.js b/js/i18n/elfinder.jp.js
@@ -2,7 +2,7 @@
  * Japanese translation
  * @author Tomoaki Yoshida <info@yoshida-studio.jp>
  * @author Naoki Sawada <hypweb@gmail.com>
- * @version 2017-08-02
+ * @version 2017-08-03
  */
 (function(root, factory) {
 	if (typeof define === 'function' && define.amd) {
@@ -158,6 +158,7 @@
 			'cmdempty'     : 'フォルダーを空に', // from v2.1.25 added 22.06.2017
 			'cmdundo'      : '元に戻す', // from v2.1.27 added 31.07.2017
 			'cmdredo'      : 'やり直し', // from v2.1.27 added 31.07.2017
+			'cmdpreference': '環境設定', // from v2.1.27 added 03.08.2017
 
 			/*********************************** buttons ***********************************/
 			'btnClose'  : '閉じる',

diff --git a/js/ui/toolbar.js b/js/ui/toolbar.js
@@ -53,6 +53,18 @@ $.fn.elfindertoolbar = function(fm, opts) {
 					}
 				}
 
+				if (!self.children().length) {
+					panel = $('<div class="ui-widget-content ui-corner-all elfinder-buttonset"/>');
+					name = 'preference';
+					if (cmd = commands[name]) {
+						button = 'elfinder'+cmd.options.ui;
+						buttons[name] = $('<div/>')[button](cmd);
+						textLabel && buttons[name].find('.elfinder-button-text').show();
+						panel.prepend(buttons[name]);
+						self.prepend(panel);
+					}
+				}
+
 				(! self.data('swipeClose') && self.children().length)? self.show() : self.hide();
 				fm.trigger('toolbarload').trigger('uiresize');
 			},
@@ -85,7 +97,7 @@ $.fn.elfindertoolbar = function(fm, opts) {
 						},
 					},{
 						label    : fm.i18n('toolbarPref'),
-						icon     : 'pref',
+						icon     : 'preference',
 						callback : function() {
 							fm.exec('help', void(0), {tab: 'preference'});
 						}