Skip to content
Snippets Groups Projects
Commit 1410ed4b authored by Adrian Lang's avatar Adrian Lang
Browse files

Provide ›original size‹ media insertion

parent 7b63547f
No related branches found
No related tags found
No related merge requests found
...@@ -141,7 +141,7 @@ $lang['js']['mediadisplaylnk'] = 'Show only the link.'; ...@@ -141,7 +141,7 @@ $lang['js']['mediadisplaylnk'] = 'Show only the link.';
$lang['js']['mediasmall'] = 'Small version'; $lang['js']['mediasmall'] = 'Small version';
$lang['js']['mediamedium'] = 'Medium version'; $lang['js']['mediamedium'] = 'Medium version';
$lang['js']['medialarge'] = 'Large 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']['medialnk'] = 'Link to detail page';
$lang['js']['mediadirect'] = 'Direct link to original'; $lang['js']['mediadirect'] = 'Direct link to original';
$lang['js']['medianolnk'] = 'No link'; $lang['js']['medianolnk'] = 'No link';
......
...@@ -310,25 +310,27 @@ var media_manager = { ...@@ -310,25 +310,27 @@ var media_manager = {
DokuCookie.setValue('link','3'); DokuCookie.setValue('link','3');
} }
// disable button for original size
$('media__sizebtn4').style.display = 'none';
} else { } else {
media_manager.ext = 'img'; media_manager.ext = 'img';
// ensure that the display buttens are there // ensure that the display buttons are there
$('media__linkbtn1').style.display = 'inline'; $('media__linkbtn1').style.display = 'inline';
$('media__linkbtn2').style.display = 'inline'; $('media__linkbtn2').style.display = 'inline';
$('media__sizebtn4').style.display = 'inline';
// set the link button to default // set the link button to default
if (media_manager.link != false) { if (DokuCookie.getValue('link')) {
media_manager.inSet('media__linkbtn'+media_manager.link);
} else if (DokuCookie.getValue('link')) {
media_manager.inSet('media__linkbtn'+DokuCookie.getValue('link'));
media_manager.link = DokuCookie.getValue('link'); media_manager.link = DokuCookie.getValue('link');
} else { }
if (media_manager.link == false) {
// default case // default case
media_manager.link = '1'; media_manager.link = '1';
media_manager.inSet('media__linkbtn1');
DokuCookie.setValue('link','1'); DokuCookie.setValue('link','1');
} }
media_manager.inSet('media__linkbtn'+media_manager.link);
} }
if (media_manager.link == '4') { if (media_manager.link == '4') {
...@@ -354,18 +356,15 @@ var media_manager = { ...@@ -354,18 +356,15 @@ var media_manager = {
} }
// set the size button to default // set the size button to default
if (media_manager.size != false) { if (DokuCookie.getValue('size')) {
media_manager.inSet('media__sizebtn'+media_manager.size);
} else if (DokuCookie.getValue('size')) {
media_manager.inSet('media__sizebtn'+DokuCookie.getValue('size'));
media_manager.size = DokuCookie.getValue('size'); media_manager.size = DokuCookie.getValue('size');
} else { }
if (media_manager.size == false || (media_manager.size === '4' && ext === '.swf')) {
// default case // default case
media_manager.size = '2'; media_manager.size = '2';
media_manager.inSet('media__sizebtn2');
DokuCookie.setValue('size','2'); DokuCookie.setValue('size','2');
} }
media_manager.inSet('media__sizebtn'+media_manager.size);
$('media__sendbtn').focus(); $('media__sendbtn').focus();
} }
...@@ -562,11 +561,6 @@ var media_manager = { ...@@ -562,11 +561,6 @@ var media_manager = {
if (media_manager.ext == 'swf') { if (media_manager.ext == 'swf') {
opts += 'x185'; opts += 'x185';
} }
} else if (s=="4") {
opts += '400';
if (media_manager.ext == 'swf') {
opts += 'x247';
}
} }
} }
if (media_manager.align == '1') { if (media_manager.align == '1') {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment