mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Use id for textarea identification

Browse Source 
this prodcues an easier compatiblity with the staticpage-plugin, and is
altogether more developer friendly than the documents.form-selector
This commit is contained in:
onli 2014-03-31 02:29:54 +02:00
parent 07ef076472
commit fd113ae212
3 changed files with 52 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
templates/2k11/admin/entries.tpl
View File

@ -22,12 +22,12 @@
{if $iso2br} {if $iso2br}
<button class="wrap_selection" type="button" name="insX" data-tag="nl" data-tarea="body">NoBR</button> <button class="wrap_selection" type="button" name="insX" data-tag="nl" data-tarea="body">NoBR</button>
{/if} {/if}
<button class="hilite_i wrap_selection" type="button" name="insI" data-tag="em" data-tarea="body">I</button> <button class="hilite_i wrap_selection" type="button" name="insI" data-tag="em" data-tarea="serendipity[body]">I</button>
<button class="hilite_b wrap_selection" type="button" name="insB" data-tag="strong" data-tarea="body">B</button> <button class="hilite_b wrap_selection" type="button" name="insB" data-tag="strong" data-tarea="serendipity[body]">B</button>
<button class="wrap_selection" type="button" name="insQ" data-tag="blockquote" data-tarea="body">{$CONST.QUOTE}</button> <button class="wrap_selection" type="button" name="insQ" data-tag="blockquote" data-tarea="serendipity[body]">{$CONST.QUOTE}</button>
<button class="wrap_insimg" type="button" name="insJ" data-tarea="body">img</button> <button class="wrap_insimg" type="button" name="insJ" data-tarea="serendipity[body]">img</button>
<button class="wrap_insmedia" type="button" name="insImage" data-tarea="body">{$CONST.MEDIA}</button> <button class="wrap_insmedia" type="button" name="insImage" data-tarea="serendipity[body]">{$CONST.MEDIA}</button>
<button class="wrap_insurl" type="button" name="insURL" data-tarea="body">URL</button> <button class="wrap_insurl" type="button" name="insURL" data-tarea="serendipity[body]">URL</button>
{serendipity_hookPlugin hook="backend_entry_toolbar_body" data=$entry_data.entry hookAll="true"} {serendipity_hookPlugin hook="backend_entry_toolbar_body" data=$entry_data.entry hookAll="true"}
</div> </div>
{/if} {/if}
@ -52,14 +52,14 @@
{if NOT $entry_vars.wysiwyg} {if NOT $entry_vars.wysiwyg}
<div id="tools_extended" class="editor_toolbar"> <div id="tools_extended" class="editor_toolbar">
{if $iso2br} {if $iso2br}
<button class="wrap_selection" type="button" name="insX" data-tag="nl" data-tarea="extended">NoBR</button> <button class="wrap_selection" type="button" name="insX" data-tag="nl" data-tarea="serendipity[extended]">NoBR</button>
{/if} {/if}
<button class="hilite_i wrap_selection" type="button" name="insI" data-tag="em" data-tarea="extended">I</button> <button class="hilite_i wrap_selection" type="button" name="insI" data-tag="em" data-tarea="serendipity[extended]">I</button>
<button class="hilite_b wrap_selection" type="button" name="insB" data-tag="strong" data-tarea="extended">B</button> <button class="hilite_b wrap_selection" type="button" name="insB" data-tag="strong" data-tarea="serendipity[extended]">B</button>
<button class="wrap_selection" type="button" name="insQ" data-tag="blockquote" data-tarea="extended">{$CONST.QUOTE}</button> <button class="wrap_selection" type="button" name="insQ" data-tag="blockquote" data-tarea="serendipity[extended]">{$CONST.QUOTE}</button>
<button class="wrap_insimg" type="button" name="insJ" data-tarea="extended">img</button> <button class="wrap_insimg" type="button" name="insJ" data-tarea="serendipity[extended]">img</button>
<button class="wrap_insmedia" type="button" name="insImage" data-tarea="extended">{$CONST.MEDIA}</button> <button class="wrap_insmedia" type="button" name="insImage" data-tarea="serendipity[extended]">{$CONST.MEDIA}</button>
<button class="wrap_insurl" type="button" name="insURL" data-tarea="extended">URL</button> <button class="wrap_insurl" type="button" name="insURL" data-tarea="serendipity[extended]">URL</button>
{serendipity_hookPlugin hook="backend_entry_toolbar_extended" data=$entry_data.entry hookAll="true"} {serendipity_hookPlugin hook="backend_entry_toolbar_extended" data=$entry_data.entry hookAll="true"}
</div> </div>
{/if} {/if}

10
templates/2k11/admin/serendipity_editor.js.tpl
View File

@ -246,7 +246,7 @@
// which works fine in NO WYSIWYG mode // which works fine in NO WYSIWYG mode
// NOTE: the serendipity_imageSelector_addToBody could add any valid HTML string to the textarea // NOTE: the serendipity_imageSelector_addToBody could add any valid HTML string to the textarea
serendipity.noWysiwygAdd = function(str, textarea) { serendipity.noWysiwygAdd = function(str, textarea) {
serendipity.wrapSelection($('textarea[name="serendipity['+textarea+']"]'), str, ''); serendipity.wrapSelection($('#'+serendipity.escapeBrackets(textarea)), str, '');
} }
// Inserting media db img markup including s9y-specific container markup // Inserting media db img markup including s9y-specific container markup
@ -907,19 +907,20 @@ $(function() {
$('.wrap_selection').click(function() { $('.wrap_selection').click(function() {
var $el = $(this); var $el = $(this);
var $tag = $el.attr('data-tag'); var $tag = $el.attr('data-tag');
var target = document.forms['serendipityEntry']['serendipity[' + $el.attr('data-tarea') + ']']; //var target = document.forms['serendipityEntry']['serendipity[' + $el.attr('data-tarea') + ']'];
var target = $('#'+serendipity.escapeBrackets($el.attr('data-tarea')));
var open = '<' + $tag + '>'; var open = '<' + $tag + '>';
var close = '</' + $tag + '>'; var close = '</' + $tag + '>';
serendipity.wrapSelection(target, open, close); serendipity.wrapSelection(target, open, close);
}); });
$('.wrap_insimg').click(function() { $('.wrap_insimg').click(function() {
var target = document.forms['serendipityEntry']['serendipity[' + $(this).attr('data-tarea') + ']']; var target = $('#'+serendipity.escapeBrackets($(this).attr('data-tarea')));
serendipity.wrapInsImage(target); serendipity.wrapInsImage(target);
}); });
$('.wrap_insurl').click(function() { $('.wrap_insurl').click(function() {
var target = document.forms['serendipityEntry']['serendipity[' + $(this).attr('data-tarea') + ']']; var target = $('#'+serendipity.escapeBrackets($(this).attr('data-tarea')));
serendipity.wrapSelectionWithLink(target); serendipity.wrapSelectionWithLink(target);
}); });
@ -1348,4 +1349,3 @@ $(function() {
} }
} }
} }

36
templates/default/admin/serendipity_editor.js
View File

@ -232,7 +232,7 @@
tinyMCE.execInstanceCommand('serendipity[' + textarea + ']', 'mceInsertContent', false, str); tinyMCE.execInstanceCommand('serendipity[' + textarea + ']', 'mceInsertContent', false, str);
return; return;
} else if (typeof(CKEDITOR) != 'undefined') { } else if (typeof(CKEDITOR) != 'undefined') {
oEditor = CKEDITOR.instances[textarea]; oEditor = (typeof(isinstance) == 'undefined') ? CKEDITOR.instances[textarea] : isinstance;
if (oEditor.mode == "wysiwyg") { if (oEditor.mode == "wysiwyg") {
oEditor.insertHtml(str); oEditor.insertHtml(str);
return; return;
@ -246,7 +246,7 @@
// which works fine in NO WYSIWYG mode // which works fine in NO WYSIWYG mode
// NOTE: the serendipity_imageSelector_addToBody could add any valid HTML string to the textarea // NOTE: the serendipity_imageSelector_addToBody could add any valid HTML string to the textarea
serendipity.noWysiwygAdd = function(str, textarea) { serendipity.noWysiwygAdd = function(str, textarea) {
serendipity.wrapSelection($('textarea[name="serendipity['+textarea+']"]'), str, ''); serendipity.wrapSelection($('#'+serendipity.escapeBrackets(textarea)), str, '');
} }
// Inserting media db img markup including s9y-specific container markup // Inserting media db img markup including s9y-specific container markup
@ -357,10 +357,10 @@
// Toggle extended entry editor // Toggle extended entry editor
serendipity.toggle_extended = function(setCookie) { serendipity.toggle_extended = function(setCookie) {
if ($('#toggle_extended').length == 0 && $('#tools_extended').length != 0) { if ($('#toggle_extended').length == 0) {
// this function got called on load of the editor // this function got called on load of the editor
var toggleButton = '#toggle_extended'; var toggleButton = '#toggle_extended';
$('textarea[name="serendipity[extended]"]').parent().find('label').first().wrap('<button id="toggle_extended" class="icon_link" type="button"></button>'); $('#extended_entry_editor').parent().find('label').first().wrap('<button id="toggle_extended" class="icon_link" type="button"></button>');
$(toggleButton).prepend('<span class="icon-down-dir"></span> '); $(toggleButton).prepend('<span class="icon-down-dir"></span> ');
$(toggleButton).click(function(e) { $(toggleButton).click(function(e) {
e.preventDefault(); e.preventDefault();
@ -372,19 +372,19 @@
} }
} }
if ($('textarea[name="serendipity[extended]"]:hidden').length > 0) { if ($('#extended_entry_editor:hidden').length > 0) {
$('textarea[name="serendipity[extended]"]').show(); // use name selector instead of id here; id does not work $('#extended_entry_editor').show(); // use name selector instead of id here; id does not work
$('#tools_extended').show(); $('#tools_extended').show();
$('#toggle_extended').find('> .icon-right-dir').removeClass('icon-right-dir').addClass('icon-down-dir'); $('#toggle_extended').find('> .icon-right-dir').removeClass('icon-right-dir').addClass('icon-down-dir');
localStorage.show_extended_editor = "true"; localStorage.show_extended_editor = "true";
} else { } else {
$('textarea[name="serendipity[extended]"]').hide(); $('#extended_entry_editor').hide();
$('#tools_extended').hide(); $('#tools_extended').hide();
$('#toggle_extended').find('> .icon-down-dir').removeClass('icon-down-dir').addClass('icon-right-dir'); $('#toggle_extended').find('> .icon-down-dir').removeClass('icon-down-dir').addClass('icon-right-dir');
localStorage.show_extended_editor = "false"; localStorage.show_extended_editor = "false";
} }
if (setCookie) { if (setCookie) {
document.cookie = 'serendipity[toggle_extended]=' + (($('textarea[name="serendipity[extended]"]:hidden').length == 0) ? "true" : "") + ';'; document.cookie = 'serendipity[toggle_extended]=' + (($('#extended_entry_editor:hidden').length == 0) ? "true" : "") + ';';
} }
} }
@ -470,7 +470,7 @@
// Rename file in media db // Rename file in media db
var media_rename = 'Enter the new name for: '; var media_rename = 'Enter the new name for: ';
var media_token_url = 'serendipity[token]=f4ec59eb1d5aeab5bc62667586b8667b'; var media_token_url = 'serendipity[token]=f269826ef0ccf3c5f76ba0674f7deca6';
serendipity.rename = function(id, fname) { serendipity.rename = function(id, fname) {
var newname; var newname;
@ -816,7 +816,7 @@ var AccessifyHTML5 = function (defaults, more_fixes) {
} }
}(document, jQuery)); }(document, jQuery));
(function($) { $(function() {
// Fire responsive nav // Fire responsive nav
if($('body').has('#main_menu').size() > 0) { if($('body').has('#main_menu').size() > 0) {
$('#nav-toggle').click(function(e) { $('#nav-toggle').click(function(e) {
@ -897,19 +897,20 @@ var AccessifyHTML5 = function (defaults, more_fixes) {
$('.wrap_selection').click(function() { $('.wrap_selection').click(function() {
var $el = $(this); var $el = $(this);
var $tag = $el.attr('data-tag'); var $tag = $el.attr('data-tag');
var target = document.forms['serendipityEntry']['serendipity[' + $el.attr('data-tarea') + ']']; //var target = document.forms['serendipityEntry']['serendipity[' + $el.attr('data-tarea') + ']'];
var target = $('#'+serendipity.escapeBrackets($el.attr('data-tarea')));
var open = '<' + $tag + '>'; var open = '<' + $tag + '>';
var close = '</' + $tag + '>'; var close = '</' + $tag + '>';
serendipity.wrapSelection(target, open, close); serendipity.wrapSelection(target, open, close);
}); });
$('.wrap_insimg').click(function() { $('.wrap_insimg').click(function() {
var target = document.forms['serendipityEntry']['serendipity[' + $(this).attr('data-tarea') + ']']; var target = $('#'+serendipity.escapeBrackets($(this).attr('data-tarea')));
serendipity.wrapInsImage(target); serendipity.wrapInsImage(target);
}); });
$('.wrap_insurl').click(function() { $('.wrap_insurl').click(function() {
var target = document.forms['serendipityEntry']['serendipity[' + $(this).attr('data-tarea') + ']']; var target = $('#'+serendipity.escapeBrackets($(this).attr('data-tarea')));
serendipity.wrapSelectionWithLink(target); serendipity.wrapSelectionWithLink(target);
}); });
@ -1277,12 +1278,18 @@ var AccessifyHTML5 = function (defaults, more_fixes) {
// Equal Heights // Equal Heights
$(window).load(function() { $(window).load(function() {
if($('body').has('.equal_heights').size() > 0) { if($('body').has('.equal_heights').size() > 0) {
if($('html').hasClass('lt-ie9')) {
$('.equal_heights').syncHeight({
updateOnResize: false
});
} else {
$('.equal_heights').syncHeight({ $('.equal_heights').syncHeight({
updateOnResize: true updateOnResize: true
}); });
} }
}
});
}); });
})(jQuery);
// This is kept for older plugins. Use of $(document).ready() is encouraged. // This is kept for older plugins. Use of $(document).ready() is encouraged.
// At some point, this will be removed. // At some point, this will be removed.
@ -1297,3 +1304,4 @@ addLoadEvent = function(func) {
} }
} }
} }