summaryrefslogtreecommitdiffstats
path: root/wp-includes/js/tinymce/themes/advanced/js
diff options
context:
space:
mode:
Diffstat (limited to 'wp-includes/js/tinymce/themes/advanced/js')
-rw-r--r--wp-includes/js/tinymce/themes/advanced/js/anchor.js8
-rw-r--r--wp-includes/js/tinymce/themes/advanced/js/color_picker.js4
-rw-r--r--wp-includes/js/tinymce/themes/advanced/js/link.js2
3 files changed, 9 insertions, 5 deletions
diff --git a/wp-includes/js/tinymce/themes/advanced/js/anchor.js b/wp-includes/js/tinymce/themes/advanced/js/anchor.js
index f1d01ea..76f4f7d 100644
--- a/wp-includes/js/tinymce/themes/advanced/js/anchor.js
+++ b/wp-includes/js/tinymce/themes/advanced/js/anchor.js
@@ -8,8 +8,10 @@ var AnchorDialog = {
elm = ed.dom.getParent(ed.selection.getNode(), 'A,IMG');
v = ed.dom.getAttrib(elm, 'name');
- if (v)
+ if (v) {
+ this.action = 'update';
f.anchorName.value = v;
+ }
f.insert.value = ed.getLang(elm ? 'update' : 'insert');
},
@@ -18,7 +20,9 @@ var AnchorDialog = {
var ed = this.editor;
tinyMCEPopup.restoreSelection();
- ed.selection.collapse(1);
+
+ if (this.action != 'update')
+ ed.selection.collapse(1);
// Webkit acts weird if empty inline element is inserted so we need to use a image instead
if (tinymce.isWebKit)
diff --git a/wp-includes/js/tinymce/themes/advanced/js/color_picker.js b/wp-includes/js/tinymce/themes/advanced/js/color_picker.js
index 148d7f5..db5ac25 100644
--- a/wp-includes/js/tinymce/themes/advanced/js/color_picker.js
+++ b/wp-includes/js/tinymce/themes/advanced/js/color_picker.js
@@ -2,7 +2,7 @@ tinyMCEPopup.requireLangPack();
var detail = 50, strhex = "0123456789abcdef", i, isMouseDown = false, isMouseOver = false;
-var colors = new Array(
+var colors = [
"#000000","#000033","#000066","#000099","#0000cc","#0000ff","#330000","#330033",
"#330066","#330099","#3300cc","#3300ff","#660000","#660033","#660066","#660099",
"#6600cc","#6600ff","#990000","#990033","#990066","#990099","#9900cc","#9900ff",
@@ -30,7 +30,7 @@ var colors = new Array(
"#66ff00","#66ff33","#66ff66","#66ff99","#66ffcc","#66ffff","#99ff00","#99ff33",
"#99ff66","#99ff99","#99ffcc","#99ffff","#ccff00","#ccff33","#ccff66","#ccff99",
"#ccffcc","#ccffff","#ffff00","#ffff33","#ffff66","#ffff99","#ffffcc","#ffffff"
-);
+];
var named = {
'#F0F8FF':'AliceBlue','#FAEBD7':'AntiqueWhite','#00FFFF':'Aqua','#7FFFD4':'Aquamarine','#F0FFFF':'Azure','#F5F5DC':'Beige',
diff --git a/wp-includes/js/tinymce/themes/advanced/js/link.js b/wp-includes/js/tinymce/themes/advanced/js/link.js
index bf310a3..a38f44b 100644
--- a/wp-includes/js/tinymce/themes/advanced/js/link.js
+++ b/wp-includes/js/tinymce/themes/advanced/js/link.js
@@ -116,7 +116,7 @@ var LinkDialog = {
if (v = tinyMCEPopup.getParam('theme_advanced_link_targets')) {
tinymce.each(v.split(','), function(v) {
v = v.split('=');
- html += '<option value="' + v[1] + '">' + v[0] + '</option>';
+ lst.options[lst.options.length] = new Option(v[0], v[1]);
});
}
}