Skip to content
This repository has been archived by the owner on Jan 19, 2022. It is now read-only.

Commit

Permalink
Updating TinyMCE advanced
Browse files Browse the repository at this point in the history
  • Loading branch information
@rossbruniges
rossbruniges committed Jun 3, 2013
1 parent d56afe6 commit eba245e
Show file tree
Hide file tree
Showing 28 changed files with 238 additions and 137 deletions.
10 changes: 5 additions & 5 deletions wp-content/plugins/tinymce-advanced/mce/advhr/rule.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{#advhr.advhr_desc}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=349"></script>
<script type="text/javascript" src="js/rule.js?ver=349"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=349"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=349"></script>
<link href="css/advhr.css?ver=349" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=358"></script>
<script type="text/javascript" src="js/rule.js?ver=358"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=358"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=358"></script>
<link href="css/advhr.css?ver=358" rel="stylesheet" type="text/css" />
</head>
<body role="application">
<form onsubmit="AdvHRDialog.update();return false;" action="#">
Expand Down
14 changes: 7 additions & 7 deletions wp-content/plugins/tinymce-advanced/mce/advimage/image.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{#advimage_dlg.dialog_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=349"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=349"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=349"></script>
<script type="text/javascript" src="../../utils/validate.js?ver=349"></script>
<script type="text/javascript" src="../../utils/editable_selects.js?ver=349"></script>
<script type="text/javascript" src="js/image.js?ver=349"></script>
<link href="css/advimage.css?ver=349" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=358"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=358"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=358"></script>
<script type="text/javascript" src="../../utils/validate.js?ver=358"></script>
<script type="text/javascript" src="../../utils/editable_selects.js?ver=358"></script>
<script type="text/javascript" src="js/image.js?ver=358"></script>
<link href="css/advimage.css?ver=358" rel="stylesheet" type="text/css" />
</head>
<body id="advimage" style="display: none" role="application" aria-labelledby="app_title">
<span id="app_title" style="display:none">{#advimage_dlg.dialog_title}</span>
Expand Down
8 changes: 5 additions & 3 deletions wp-content/plugins/tinymce-advanced/mce/advimage/js/image.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -395,12 +395,14 @@ var ImageDialog = {
if (v == '0')
img.style.border = isIE ? '0' : '0 none none';
else {
if (b.length == 3 && b[isIE ? 2 : 1])
bStyle = b[isIE ? 2 : 1];
var isOldIE = tinymce.isIE && (!document.documentMode || document.documentMode < 9);

if (b.length == 3 && b[isOldIE ? 2 : 1])
bStyle = b[isOldIE ? 2 : 1];
else if (!bStyle || bStyle == 'none')
bStyle = 'solid';
if (b.length == 3 && b[isIE ? 0 : 2])
bColor = b[isIE ? 0 : 2];
bColor = b[isOldIE ? 0 : 2];
else if (!bColor || bColor == 'none')
bColor = 'black';
img.style.border = v + 'px ' + bStyle + ' ' + bColor;
Expand Down
14 changes: 9 additions & 5 deletions wp-content/plugins/tinymce-advanced/mce/advlink/js/advlink.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,14 @@ function init() {
if (elm != null && elm.nodeName == "A")
action = "update";

formObj.insert.value = tinyMCEPopup.getLang(action, 'Insert', true);
formObj.insert.value = tinyMCEPopup.getLang(action, 'Insert', true);

setPopupControlsDisabled(true);

if (action == "update") {
var href = inst.dom.getAttrib(elm, 'href');
var onclick = inst.dom.getAttrib(elm, 'onclick');
var linkTarget = inst.dom.getAttrib(elm, 'target') ? inst.dom.getAttrib(elm, 'target') : "_self";

// Setup form data
setFormValue('href', href);
Expand Down Expand Up @@ -98,7 +99,7 @@ function init() {
setFormValue('onkeypress', inst.dom.getAttrib(elm, 'onkeypress'));
setFormValue('onkeydown', inst.dom.getAttrib(elm, 'onkeydown'));
setFormValue('onkeyup', inst.dom.getAttrib(elm, 'onkeyup'));
setFormValue('target', inst.dom.getAttrib(elm, 'target'));
setFormValue('target', linkTarget);
setFormValue('classes', inst.dom.getAttrib(elm, 'class'));

// Parse onclick data
Expand All @@ -119,7 +120,7 @@ function init() {
addClassesToList('classlist', 'advlink_styles');

selectByValue(formObj, 'classlist', inst.dom.getAttrib(elm, 'class'), true);
selectByValue(formObj, 'targetlist', inst.dom.getAttrib(elm, 'target'), true);
selectByValue(formObj, 'targetlist', linkTarget, true);
} else
addClassesToList('classlist', 'advlink_styles');
}
Expand Down Expand Up @@ -377,6 +378,9 @@ function getAnchorListHTML(id, target) {
for (i=0, len=nodes.length; i<len; i++) {
if ((name = ed.dom.getAttrib(nodes[i], "name")) != "")
html += '<option value="#' + name + '">' + name + '</option>';

if ((name = nodes[i].id) != "" && !nodes[i].href)
html += '<option value="#' + name + '">' + name + '</option>';
}

if (html == "")
Expand Down Expand Up @@ -488,7 +492,7 @@ function getLinkListHTML(elm_id, target_form_element, onchange_func) {
var html = "";

html += '<select id="' + elm_id + '" name="' + elm_id + '"';
html += ' class="mceLinkList" onfoc2us="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target_form_element + '.value=';
html += ' class="mceLinkList" onchange="this.form.' + target_form_element + '.value=';
html += 'this.options[this.selectedIndex].value;';

if (typeof(onchange_func) != "undefined")
Expand All @@ -510,7 +514,7 @@ function getTargetListHTML(elm_id, target_form_element) {
var targets = tinyMCEPopup.getParam('theme_advanced_link_targets', '').split(';');
var html = '';

html += '<select id="' + elm_id + '" name="' + elm_id + '" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target_form_element + '.value=';
html += '<select id="' + elm_id + '" name="' + elm_id + '" onchange="this.form.' + target_form_element + '.value=';
html += 'this.options[this.selectedIndex].value;">';
html += '<option value="_self">' + tinyMCEPopup.getLang('advlink_dlg.target_same') + '</option>';
html += '<option value="_blank">' + tinyMCEPopup.getLang('advlink_dlg.target_blank') + ' (_blank)</option>';
Expand Down
12 changes: 6 additions & 6 deletions wp-content/plugins/tinymce-advanced/mce/advlink/link.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{#advlink_dlg.title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=349"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=349"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=349"></script>
<script type="text/javascript" src="../../utils/validate.js?ver=349"></script>
<script type="text/javascript" src="js/advlink.js?ver=349"></script>
<link href="css/advlink.css?ver=349" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=358"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=358"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=358"></script>
<script type="text/javascript" src="../../utils/validate.js?ver=358"></script>
<script type="text/javascript" src="js/advlink.js?ver=358"></script>
<link href="css/advlink.css?ver=358" rel="stylesheet" type="text/css" />
</head>
<body id="advlink" style="display: none" role="application" onload="javascript:mcTabs.displayTab('general_tab','general_panel', true);" aria-labelledby="app_label">
<span class="mceVoiceLabel" id="app_label" style="display:none;">{#advlink_dlg.title}</span>
Expand Down
2 changes: 1 addition & 1 deletion wp-content/plugins/tinymce-advanced/mce/contextmenu/editor_plugin.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions wp-content/plugins/tinymce-advanced/mce/searchreplace/searchreplace.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{#searchreplace_dlg.replace_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=349"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=349"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=349"></script>
<script type="text/javascript" src="js/searchreplace.js?ver=349"></script>
<link rel="stylesheet" type="text/css" href="css/searchreplace.css?ver=349" />
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=358"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=358"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=358"></script>
<script type="text/javascript" src="js/searchreplace.js?ver=358"></script>
<link rel="stylesheet" type="text/css" href="css/searchreplace.css?ver=358" />
</head>
<body style="display:none;" role="application" aria-labelledby="app_title">
<span id="app_title" style="display:none">{#searchreplace_dlg.replace_title}</span>
Expand Down Expand Up @@ -93,7 +93,7 @@
<input type="submit" id="insert" name="insert" value="{#searchreplace_dlg.findnext}" />
<input type="button" class="button" id="replaceBtn" name="replaceBtn" value="{#searchreplace_dlg.replace}" onclick="SearchReplaceDialog.searchNext('current');" />
<input type="button" class="button" id="replaceAllBtn" name="replaceAllBtn" value="{#searchreplace_dlg.replaceall}" onclick="SearchReplaceDialog.searchNext('all');" />
<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
<input type="button" id="cancel" name="close" value="{#close}" onclick="tinyMCEPopup.close();" />
</div>
</form>
</body>
Expand Down
1 change: 1 addition & 0 deletions wp-content/plugins/tinymce-advanced/mce/style/css/props.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ select, #block_text_indent, #box_width, #box_height, #box_padding_top, #box_padd
#box_margin_top, #box_margin_right, #box_margin_bottom, #box_margin_left, #positioning_width, #positioning_height, #positioning_zindex {width:70px;}
#positioning_placement_top, #positioning_placement_right, #positioning_placement_bottom, #positioning_placement_left {width:70px;}
#positioning_clip_top, #positioning_clip_right, #positioning_clip_bottom, #positioning_clip_left {width:70px;}
.panel_toggle_insert_span {padding-top:10px;}
.panel_wrapper div.current {padding-top:10px;height:230px;}
.delim {border-left:1px solid gray;}
.tdelim {border-bottom:1px solid gray;}
Expand Down
2 changes: 1 addition & 1 deletion wp-content/plugins/tinymce-advanced/mce/style/editor_plugin.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

65 changes: 62 additions & 3 deletions wp-content/plugins/tinymce-advanced/mce/style/js/props.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,41 @@ var defaultBorderStyle = "none;solid;dashed;dotted;double;groove;ridge;inset;out
var defaultBorderWidth = "thin;medium;thick";
var defaultListType = "disc;circle;square;decimal;lower-roman;upper-roman;lower-alpha;upper-alpha;none";

function init() {
function aggregateStyles(allStyles) {
var mergedStyles = {};

tinymce.each(allStyles, function(style) {
if (style !== '') {
var parsedStyles = tinyMCEPopup.editor.dom.parseStyle(style);
for (var name in parsedStyles) {
if (parsedStyles.hasOwnProperty(name)) {
if (mergedStyles[name] === undefined) {
mergedStyles[name] = parsedStyles[name];
}
else if (name === 'text-decoration') {
if (mergedStyles[name].indexOf(parsedStyles[name]) === -1) {
mergedStyles[name] = mergedStyles[name] +' '+ parsedStyles[name];
}
}
}
}
}
});

return mergedStyles;
}

var applyActionIsInsert;
var existingStyles;

function init(ed) {
var ce = document.getElementById('container'), h;

ce.style.cssText = tinyMCEPopup.getWindowArg('style_text');
existingStyles = aggregateStyles(tinyMCEPopup.getWindowArg('styles'));
ce.style.cssText = tinyMCEPopup.editor.dom.serializeStyle(existingStyles);

applyActionIsInsert = ed.getParam("edit_css_style_insert_span", false);
document.getElementById('toggle_insert_span').checked = applyActionIsInsert;

h = getBrowserHTML('background_image_browser','background_image','image','advimage');
document.getElementById("background_image_browser").innerHTML = h;
Expand Down Expand Up @@ -368,13 +399,41 @@ function hasEqualValues(a) {
return true;
}

function toggleApplyAction() {
applyActionIsInsert = ! applyActionIsInsert;
}

function applyAction() {
var ce = document.getElementById('container'), ed = tinyMCEPopup.editor;

generateCSS();

tinyMCEPopup.restoreSelection();
ed.dom.setAttrib(ed.selection.getSelectedBlocks(), 'style', tinyMCEPopup.editor.dom.serializeStyle(tinyMCEPopup.editor.dom.parseStyle(ce.style.cssText)));

var newStyles = tinyMCEPopup.editor.dom.parseStyle(ce.style.cssText);

if (applyActionIsInsert) {
ed.formatter.register('plugin_style', {
inline: 'span', styles: existingStyles
});
ed.formatter.remove('plugin_style');

ed.formatter.register('plugin_style', {
inline: 'span', styles: newStyles
});
ed.formatter.apply('plugin_style');
} else {
var nodes;

if (tinyMCEPopup.getWindowArg('applyStyleToBlocks')) {
nodes = ed.selection.getSelectedBlocks();
}
else {
nodes = ed.selection.getNode();
}

ed.dom.setAttrib(nodes, 'style', tinyMCEPopup.editor.dom.serializeStyle(newStyles));
}
}

function updateAction() {
Expand Down
Loading

0 comments on commit eba245e

Please sign in to comment.