Changeset 3701:16d6d099e144

Timestamp:

02/15/18 13:03:37 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Admin popups: dealing with Enter key fired, and focus on first input when opening.

Location:

admin

Files:

• js/_media_item.js (modified) (1 diff)
• js/_popup_link.js (added)
• js/_popup_posts.js (added)
• js/common.js (modified) (1 diff)
• popup_link.php (modified) (1 diff)
• popup_posts.php (modified) (1 diff)

admin/js/_media_item.js

@@ -78 +78 @@
      });
 
+  // Set focus if in popup mode
+  $('#media-insert-form :input:visible:enabled:checked:first, #media-insert-form :input:visible:enabled:first').focus();
+
+  // Deal with enter key on media insert popup form : every form element will be filtered but Cancel button
+  dotclear.enterKeyInForm('#media-insert-form', '#media-insert-ok', '#media-insert-cancel');
 });

admin/js/common.js

@@ -297 +297 @@
 var dotclear = {
   msg: {},
+  enterKeyInForm: function(frm_id, ok_id, cancel_id) {
+    $(frm_id + ':not(' + cancel_id + ')').keyup(function(e) {
+      if (e.key == 'Enter') {
+        e.preventDefault();
+        e.stopPropagation();
+        $(ok_id).trigger('click');
+      }
+    });
+  },
   condSubmit: function(chkboxes, target) {
     var checkboxes = $(chkboxes),

admin/popup_link.php

@@ -11 +11 @@
 # -- END LICENSE BLOCK -----------------------------------------
 
-require dirname(__FILE__).'/../inc/admin/prepend.php';
+require dirname(__FILE__) . '/../inc/admin/prepend.php';
 
 dcPage::check('usage,contentadmin');
 
-$href = !empty($_GET['href']) ? $_GET['href'] : '';
-$hreflang = !empty($_GET['hreflang']) ? $_GET['hreflang'] : '';
-$title = !empty($_GET['title']) ? $_GET['title'] : '';
+$href      = !empty($_GET['href']) ? $_GET['href'] : '';
+$hreflang  = !empty($_GET['hreflang']) ? $_GET['hreflang'] : '';
+$title     = !empty($_GET['title']) ? $_GET['title'] : '';
 $plugin_id = !empty($_GET['plugin_id']) ? html::sanitizeURL($_GET['plugin_id']) : '';
 
-dcPage::openPopup(__('Add a link'),$core->callBehavior('adminPopupLink', $plugin_id));
+dcPage::openPopup(__('Add a link'), dcPage::jsLoad('js/_popup_link.js') . $core->callBehavior('adminPopupLink', $plugin_id));
 
-echo '<h2 class="page-title">'.__('Add a link').'</h2>';
+echo '<h2 class="page-title">' . __('Add a link') . '</h2>';
 
 # Languages combo
-$rs = $core->blog->getLangs(array('order'=>'asc'));
-$lang_combo = dcAdminCombos::getLangsCombo($rs,true);
+$rs         = $core->blog->getLangs(array('order' => 'asc'));
+$lang_combo = dcAdminCombos::getLangsCombo($rs, true);
 
 echo
-'<form id="link-insert-form" action="#" method="get">'.
-'<p><label class="required" for="href"><abbr title="'.__('Required field').'">*</abbr> '.__('Link URL:').'</label> '.
-form::field('href',35,512,html::escapeHTML($href),'','',false,'required placeholder="'.__('URL').'"').'</p>'.
-'<p><label for="title">'.__('Link title:').'</label> '.
-form::field('title',35,512,html::escapeHTML($title)).'</p>'.
-'<p><label for="hreflang">'.__('Link language:').'</label> '.
-form::combo('hreflang',$lang_combo,$hreflang).
-'</p>'.
+'<form id="link-insert-form" action="#" method="get">' .
+'<p><label class="required" for="href"><abbr title="' . __('Required field') . '">*</abbr> ' . __('Link URL:') . '</label> ' .
+form::field('href', 35, 512, html::escapeHTML($href), '', '', false, 'required placeholder="' . __('URL') . '"') . '</p>' .
+'<p><label for="title">' . __('Link title:') . '</label> ' .
+form::field('title', 35, 512, html::escapeHTML($title)) . '</p>' .
+'<p><label for="hreflang">' . __('Link language:') . '</label> ' .
+form::combo('hreflang', $lang_combo, $hreflang) .
+'</p>' .
 
-'</form>'.
+'</form>' .
 
-'<p><button type="button" class="reset" id="link-insert-cancel">'.__('Cancel').'</button> - '.
-'<button type="button" id="link-insert-ok"><strong>'.__('Insert').'</strong></button></p>'."\n".
-
-'<script type="text/javascript">'."\n".
-'$(\'input[name="href"]\').get(0).focus();'."\n".
-'</script>'."\n";
+'<p><button type="button" class="reset" id="link-insert-cancel">' . __('Cancel') . '</button> - ' .
+'<button type="button" id="link-insert-ok"><strong>' . __('Insert') . '</strong></button></p>' . "\n";
 
 dcPage::closePopup();

admin/popup_posts.php

@@ -46 +46 @@
 dcPage::openPopup(__('Add a link to an entry'),
      dcPage::jsLoad('js/_posts_list.js').
+    dcPage::jsLoad('js/_popup_posts.js').
      $core->callBehavior('adminPopupPosts', $plugin_id));