diff options
| -rw-r--r-- | inc/lang/en/lang.php | 2 | ||||
| -rw-r--r-- | lib/scripts/media.js | 32 |
2 files changed, 14 insertions, 20 deletions
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 82e414cd3..7cbf10029 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -141,7 +141,7 @@ $lang['js']['mediadisplaylnk'] = 'Show only the link.'; $lang['js']['mediasmall'] = 'Small version'; $lang['js']['mediamedium'] = 'Medium version'; $lang['js']['medialarge'] = 'Large version'; -$lang['js']['mediaextralarge'] = 'Extra large version'; +$lang['js']['mediaoriginal'] = 'Original version'; $lang['js']['medialnk'] = 'Link to detail page'; $lang['js']['mediadirect'] = 'Direct link to original'; $lang['js']['medianolnk'] = 'No link'; diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 599dbbdfa..f14db63d7 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -310,25 +310,27 @@ var media_manager = { DokuCookie.setValue('link','3'); } + // disable button for original size + $('media__sizebtn4').style.display = 'none'; + } else { media_manager.ext = 'img'; - // ensure that the display buttens are there + // ensure that the display buttons are there $('media__linkbtn1').style.display = 'inline'; $('media__linkbtn2').style.display = 'inline'; + $('media__sizebtn4').style.display = 'inline'; // set the link button to default - if (media_manager.link != false) { - media_manager.inSet('media__linkbtn'+media_manager.link); - } else if (DokuCookie.getValue('link')) { - media_manager.inSet('media__linkbtn'+DokuCookie.getValue('link')); + if (DokuCookie.getValue('link')) { media_manager.link = DokuCookie.getValue('link'); - } else { + } + if (media_manager.link == false) { // default case media_manager.link = '1'; - media_manager.inSet('media__linkbtn1'); DokuCookie.setValue('link','1'); } + media_manager.inSet('media__linkbtn'+media_manager.link); } if (media_manager.link == '4') { @@ -354,18 +356,15 @@ var media_manager = { } // set the size button to default - if (media_manager.size != false) { - media_manager.inSet('media__sizebtn'+media_manager.size); - } else if (DokuCookie.getValue('size')) { - media_manager.inSet('media__sizebtn'+DokuCookie.getValue('size')); + if (DokuCookie.getValue('size')) { media_manager.size = DokuCookie.getValue('size'); - } else { + } + if (media_manager.size == false || (media_manager.size === '4' && ext === '.swf')) { // default case media_manager.size = '2'; - media_manager.inSet('media__sizebtn2'); DokuCookie.setValue('size','2'); } - + media_manager.inSet('media__sizebtn'+media_manager.size); $('media__sendbtn').focus(); } @@ -562,11 +561,6 @@ var media_manager = { if (media_manager.ext == 'swf') { opts += 'x185'; } - } else if (s=="4") { - opts += '400'; - if (media_manager.ext == 'swf') { - opts += 'x247'; - } } } if (media_manager.align == '1') { |