From 5fecec74eca138ff7bbb30e50e4de13209791d41 Mon Sep 17 00:00:00 2001 From: FlipZoomMedia Date: Fri, 16 Sep 2022 11:46:32 -0400 Subject: [PATCH] Add PR #244 - remember language tabs focus between requests after a double-click on a language tab --- wire/modules/LanguageSupport/LanguageTabs.js | 8 ++++++++ .../LanguageSupport/LanguageTabs.min.js | 2 +- .../LanguageSupport/LanguageTabs.module | 20 +++++++++++-------- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/wire/modules/LanguageSupport/LanguageTabs.js b/wire/modules/LanguageSupport/LanguageTabs.js index 11c553e1..c2a965c7 100644 --- a/wire/modules/LanguageSupport/LanguageTabs.js +++ b/wire/modules/LanguageSupport/LanguageTabs.js @@ -24,6 +24,8 @@ function dblclickLanguageTab(e) { setTimeout(function() { clickLanguageTabActive = false; }, 250); + var cfg = ProcessWire.config.LanguageTabs; + jQuery.cookie('langTabsDC', langID + '-' + cfg.requestId); } /** @@ -99,6 +101,12 @@ function setupLanguageTabs($form) { $links.eq(cfg.activeTab).click(); } }); + + var value = jQuery.cookie('langTabsDC'); // DC=DoubleClick + if(value && value.indexOf('-' + cfg.requestId) > 0) { + value = value.split('-'); // i.e. 123-ProcessPageEdit456 + $('a.langTab' + value[0], $form).click(); + } } /** diff --git a/wire/modules/LanguageSupport/LanguageTabs.min.js b/wire/modules/LanguageSupport/LanguageTabs.min.js index d78823a4..d6b8f0fc 100644 --- a/wire/modules/LanguageSupport/LanguageTabs.min.js +++ b/wire/modules/LanguageSupport/LanguageTabs.min.js @@ -1 +1 @@ -var clickLanguageTabActive=false;function dblclickLanguageTab(e){if(clickLanguageTabActive)return;clickLanguageTabActive=true;var $tab=$(this);var langID=$tab.attr("data-lang");var $tabs=$tab.closest("form").find("a.langTab"+langID).not($tab);$tab.click();$tabs.click();$tabs.effect("highlight",250);setTimeout(function(){clickLanguageTabActive=false},250)}function setupLanguageTabs($form){var $langTabs;var cfg=ProcessWire.config.LanguageTabs;if($form.hasClass("langTabs"))$langTabs=$form;else $langTabs=$form.find(".langTabs");$langTabs.each(function(){var $this=$(this);if($this.hasClass("langTabsInit")||$this.hasClass("ui-tabs"))return;var $inputfield=$this.closest(".Inputfield");var $content=$inputfield.children(".InputfieldContent");if(!$content.hasClass("langTabsContainer")){if($inputfield.find(".langTabsContainer").length==0)$content.addClass("langTabsContainer")}if(cfg.jQueryUI)$this.tabs({active:cfg.activeTab});$this.addClass("langTabsInit");if($inputfield.length)$inputfield.addClass("hasLangTabs");var $parent=$this.parent(".InputfieldContent");if($parent.length){var $span=$("").attr("title",cfg.labelOpen).attr("class","langTabsToggle").append("");$parent.prev(".InputfieldHeader").append($span)}var $links=$this.find("a.langTabLink");var timeout=null;var $note=$parent.find(".langTabsNote");if(!$links.length){$links=$this.find("a[data-lang]");if(!$links.length)$links=$this.find("a");$links.addClass("langTabLink")}$links.on("mouseover",function(){if(timeout)clearTimeout(timeout);if($parent.width()<500)return;timeout=setTimeout(function(){$note.fadeIn("fast")},250)}).on("mouseout",function(){if(timeout)clearTimeout(timeout);if($parent.width()<500)return;timeout=setTimeout(function(){$note.fadeOut("fast")},250)}).on("click",function(){var $a=$(this);var $items=$a.closest("ul").siblings(".LanguageSupport");var $closeItem=$items.filter(".LanguageSupportCurrent");var $openItem=$items.filter($a.attr("href"));if($closeItem.attr("id")==$openItem.attr("id")){$a.trigger("dblclicklangtab")}else{$closeItem.removeClass("LanguageSupportCurrent");$openItem.addClass("LanguageSupportCurrent");$a.trigger("clicklangtab",[$openItem,$closeItem])}var $ukTab=$a.closest("ul.uk-tab");if($ukTab.length){$ukTab.find(".uk-active").removeClass("uk-active");$a.closest("li").addClass("uk-active")}});if(!cfg.jQueryUI){$links.eq(cfg.activeTab).click()}})}function toggleLanguageTabs(){var $this=$(this);var $header=$this.closest(".InputfieldHeader");var $content=$header.next(".InputfieldContent");var $inputfield=$header.parent(".Inputfield");var $langTabs=$content.children(".langTabs");var $ul=$langTabs.children("ul");var cfg=ProcessWire.config.LanguageTabs;clickLanguageTabActive=true;if($content.hasClass("langTabsContainer")){$ul.find(".langTabLastActive").removeClass("langTabLastActive");if(cfg.liActiveClass)$ul.find("."+cfg.liActiveClass).addClass("langTabLastActive");$ul.find("a").click();$content.removeClass("langTabsContainer");$inputfield.removeClass("hasLangTabs").addClass("langTabsOff");$this.addClass("langTabsOff");if(cfg.jQueryUI)$langTabs.tabs("destroy");$ul.hide();$this.attr("title",ProcessWire.config.LanguageTabs.labelClose).find("i").removeClass("fa-folder-o").addClass("fa-folder-open-o")}else{$content.addClass("langTabsContainer");$inputfield.addClass("hasLangTabs").removeClass("langTabsOff");$this.removeClass("langTabsOff");if(cfg.jQueryUI)$langTabs.tabs();$ul.show();$(this).attr("title",cfg.labelOpen).find("i").addClass("fa-folder-o").removeClass("fa-folder-open-o");$ul.find(".langTabLastActive").removeClass("langTabLastActive").children("a").click()}clickLanguageTabActive=false;return false}function hideLanguageTabs(){$(".InputfieldContent").each(function(){var n=0;$(this).children(".LanguageSupport").each(function(){if(++n==1){$(this).closest(".Inputfield").addClass("hadLanguageSupport");return}$(this).addClass("langTabsHidden")})});var $tab=$(".langTabs").find("li:eq(0)");var cfg=ProcessWire.config.LanguageTabs;if(cfg.liActiveClass&&!$tab.hasClass(cfg.liActiveClass))$tab.find("a").click();$(".langTabsToggle, .LanguageSupportLabel:visible, .langTabs > ul").addClass("langTabsHidden");$(".hasLangTabs").removeClass("hasLangTabs").addClass("hadLangTabs")}function unhideLanguageTabs(){$(".langTabsHidden").removeClass("langTabsHidden");$(".hadLangTabs").removeClass("hadLangTabs").addClass("hasLangTabs");$(".hadLanguageSupport").removeClass("hadLanguageSupport")}jQuery(document).ready(function($){$(document).on("click",".langTabsToggle",toggleLanguageTabs);$(document).on("dblclicklangtab","a.langTabLink",dblclickLanguageTab);$(document).on("reloaded",".Inputfield",function(){var $inputfield=$(this);setTimeout(function(){setupLanguageTabs($inputfield)},100)});$(document).on("AjaxUploadDone",".InputfieldHasFileList .InputfieldFileList",function(){setupLanguageTabs($(this))})}); \ No newline at end of file +var clickLanguageTabActive=false;function dblclickLanguageTab(e){if(clickLanguageTabActive)return;clickLanguageTabActive=true;var $tab=$(this);var langID=$tab.attr("data-lang");var $tabs=$tab.closest("form").find("a.langTab"+langID).not($tab);$tab.click();$tabs.click();$tabs.effect("highlight",250);setTimeout(function(){clickLanguageTabActive=false},250);var cfg=ProcessWire.config.LanguageTabs;jQuery.cookie("langTabsDC",langID+"-"+cfg.requestId)}function setupLanguageTabs($form){var $langTabs;var cfg=ProcessWire.config.LanguageTabs;if($form.hasClass("langTabs"))$langTabs=$form;else $langTabs=$form.find(".langTabs");$langTabs.each(function(){var $this=$(this);if($this.hasClass("langTabsInit")||$this.hasClass("ui-tabs"))return;var $inputfield=$this.closest(".Inputfield");var $content=$inputfield.children(".InputfieldContent");if(!$content.hasClass("langTabsContainer")){if($inputfield.find(".langTabsContainer").length==0)$content.addClass("langTabsContainer")}if(cfg.jQueryUI)$this.tabs({active:cfg.activeTab});$this.addClass("langTabsInit");if($inputfield.length)$inputfield.addClass("hasLangTabs");var $parent=$this.parent(".InputfieldContent");if($parent.length){var $span=$("").attr("title",cfg.labelOpen).attr("class","langTabsToggle").append("");$parent.prev(".InputfieldHeader").append($span)}var $links=$this.find("a.langTabLink");var timeout=null;var $note=$parent.find(".langTabsNote");if(!$links.length){$links=$this.find("a[data-lang]");if(!$links.length)$links=$this.find("a");$links.addClass("langTabLink")}$links.on("mouseover",function(){if(timeout)clearTimeout(timeout);if($parent.width()<500)return;timeout=setTimeout(function(){$note.fadeIn("fast")},250)}).on("mouseout",function(){if(timeout)clearTimeout(timeout);if($parent.width()<500)return;timeout=setTimeout(function(){$note.fadeOut("fast")},250)}).on("click",function(){var $a=$(this);var $items=$a.closest("ul").siblings(".LanguageSupport");var $closeItem=$items.filter(".LanguageSupportCurrent");var $openItem=$items.filter($a.attr("href"));if($closeItem.attr("id")==$openItem.attr("id")){$a.trigger("dblclicklangtab")}else{$closeItem.removeClass("LanguageSupportCurrent");$openItem.addClass("LanguageSupportCurrent");$a.trigger("clicklangtab",[$openItem,$closeItem])}var $ukTab=$a.closest("ul.uk-tab");if($ukTab.length){$ukTab.find(".uk-active").removeClass("uk-active");$a.closest("li").addClass("uk-active")}});if(!cfg.jQueryUI){$links.eq(cfg.activeTab).click()}});var value=jQuery.cookie("langTabsDC");if(value&&value.indexOf("-"+cfg.requestId)>0){value=value.split("-");$("a.langTab"+value[0],$form).click()}}function toggleLanguageTabs(){var $this=$(this);var $header=$this.closest(".InputfieldHeader");var $content=$header.next(".InputfieldContent");var $inputfield=$header.parent(".Inputfield");var $langTabs=$content.children(".langTabs");var $ul=$langTabs.children("ul");var cfg=ProcessWire.config.LanguageTabs;clickLanguageTabActive=true;if($content.hasClass("langTabsContainer")){$ul.find(".langTabLastActive").removeClass("langTabLastActive");if(cfg.liActiveClass)$ul.find("."+cfg.liActiveClass).addClass("langTabLastActive");$ul.find("a").click();$content.removeClass("langTabsContainer");$inputfield.removeClass("hasLangTabs").addClass("langTabsOff");$this.addClass("langTabsOff");if(cfg.jQueryUI)$langTabs.tabs("destroy");$ul.hide();$this.attr("title",ProcessWire.config.LanguageTabs.labelClose).find("i").removeClass("fa-folder-o").addClass("fa-folder-open-o")}else{$content.addClass("langTabsContainer");$inputfield.addClass("hasLangTabs").removeClass("langTabsOff");$this.removeClass("langTabsOff");if(cfg.jQueryUI)$langTabs.tabs();$ul.show();$(this).attr("title",cfg.labelOpen).find("i").addClass("fa-folder-o").removeClass("fa-folder-open-o");$ul.find(".langTabLastActive").removeClass("langTabLastActive").children("a").click()}clickLanguageTabActive=false;return false}function hideLanguageTabs(){$(".InputfieldContent").each(function(){var n=0;$(this).children(".LanguageSupport").each(function(){if(++n==1){$(this).closest(".Inputfield").addClass("hadLanguageSupport");return}$(this).addClass("langTabsHidden")})});var $tab=$(".langTabs").find("li:eq(0)");var cfg=ProcessWire.config.LanguageTabs;if(cfg.liActiveClass&&!$tab.hasClass(cfg.liActiveClass))$tab.find("a").click();$(".langTabsToggle, .LanguageSupportLabel:visible, .langTabs > ul").addClass("langTabsHidden");$(".hasLangTabs").removeClass("hasLangTabs").addClass("hadLangTabs")}function unhideLanguageTabs(){$(".langTabsHidden").removeClass("langTabsHidden");$(".hadLangTabs").removeClass("hadLangTabs").addClass("hasLangTabs");$(".hadLanguageSupport").removeClass("hadLanguageSupport")}jQuery(document).ready(function($){$(document).on("click",".langTabsToggle",toggleLanguageTabs);$(document).on("dblclicklangtab","a.langTabLink",dblclickLanguageTab);$(document).on("reloaded",".Inputfield",function(){var $inputfield=$(this);setTimeout(function(){setupLanguageTabs($inputfield)},100)});$(document).on("AjaxUploadDone",".InputfieldHasFileList .InputfieldFileList",function(){setupLanguageTabs($(this))})}); \ No newline at end of file diff --git a/wire/modules/LanguageSupport/LanguageTabs.module b/wire/modules/LanguageSupport/LanguageTabs.module index 359fb6c9..1b884a94 100644 --- a/wire/modules/LanguageSupport/LanguageTabs.module +++ b/wire/modules/LanguageSupport/LanguageTabs.module @@ -20,9 +20,9 @@ class LanguageTabs extends WireData implements Module, ConfigurableModule { public static function getModuleInfo() { return array( 'title' => 'Languages Support - Tabs', - 'version' => 115, + 'version' => 116, 'summary' => 'Organizes multi-language fields into tabs for a cleaner easier to use interface.', - 'author' => 'adamspruijt, ryan', + 'author' => 'adamspruijt, ryan, flipzoom', 'singular' => true, 'autoload' => "template=admin", 'requires' => 'LanguageSupport' @@ -74,20 +74,22 @@ class LanguageTabs extends WireData implements Module, ConfigurableModule { if(!empty($this->settings)) return $this->settings; $language = null; + $input = $this->wire()->input; + $languages = $this->wire()->languages; // allow for specifying language in your "edit" page link, from front-end // so if you want to focus on the Spanish tabs when the user clicks "edit" // from /es/path/to/page/, then you can by using a page edit link like: // Edit - $id = (int) $this->input->get('language'); - if($id) $language = $this->languages->get($id); + $id = (int) $input->get('language'); + if($id) $language = $languages->get($id); // if language is not specified as a GET variable, then use the user's language if(!$language || !$language->id) $language = $this->wire()->user->language; // determine the index of the tab for the user's language $activeTab = 0; - foreach($this->wire()->languages as $index => $lang) { + foreach($languages as $index => $lang) { if($lang->id == $language->id) $activeTab = $index; } @@ -105,6 +107,7 @@ class LanguageTabs extends WireData implements Module, ConfigurableModule { 'loadStyles' => true, 'loadScripts' => true, 'tabField' => $this->get('tabField'), + 'requestId' => ((string) $this->wire()->process) . (int) $input->get('id'), ); $config = $this->wire()->config; @@ -133,20 +136,21 @@ class LanguageTabs extends WireData implements Module, ConfigurableModule { $config = $this->wire()->config; if($settings['jQueryUI']) { - $adminTheme = $this->wire('adminTheme'); + $adminTheme = $this->wire()->adminTheme; if($adminTheme) $adminTheme->addBodyClass('LanguageTabsJqueryUI'); } if($settings['loadStyles']) { - $config->styles->add($config->urls->LanguageTabs . 'LanguageTabs.css'); + $config->styles->add($config->urls('LanguageTabs') . 'LanguageTabs.css'); } if($settings['loadScripts']) { - $config->scripts->add($config->urls->LanguageTabs . 'LanguageTabs.js'); + $config->scripts->add($config->urls('LanguageTabs') . 'LanguageTabs.js'); } /** @var JqueryCore $jQueryCore */ $jQueryCore = $this->wire()->modules->get('JqueryCore'); $jQueryCore->use('longclick'); + $jQueryCore->use('cookie'); if(strpos($e->return, 'LanguageSupport') === false) return;