TinyMCE Advanced - Version 3.4.9

Version Description

Updated for WordPress 3.4 and TinyMCE 3.4.9.

Release Info

Developer	azaozz
Plugin	TinyMCE Advanced
Version	3.4.9
Comparing to
See all releases

Code changes from version 3.4.5.1 to 3.4.9

Files changed (33) hide show

mce/advhr/langs/ja_dlg.js +1 -1
mce/advhr/rule.htm +5 -5
mce/advimage/image.htm +7 -7
mce/advimage/langs/ja_dlg.js +1 -1
mce/advimage/langs/ru_dlg.js +1 -1
mce/advlink/js/advlink.js +8 -1
mce/advlink/langs/ja_dlg.js +1 -1
mce/advlink/link.htm +6 -6
mce/contextmenu/editor_plugin.js +1 -1
mce/layer/editor_plugin.js +1 -1
mce/searchreplace/langs/ja_dlg.js +1 -1
mce/searchreplace/searchreplace.htm +5 -5
mce/style/js/props.js +15 -0
mce/style/langs/ja_dlg.js +1 -1
mce/style/langs/zh_dlg.js +1 -1
mce/style/props.htm +7 -7
mce/table/cell.htm +7 -7
mce/table/editor_plugin.js +1 -1
mce/table/js/table.js +50 -12
mce/table/langs/ja_dlg.js +1 -1
mce/table/merge_cells.htm +4 -4
mce/table/row.htm +7 -7
mce/table/table.htm +8 -8
mce/xhtmlxtras/abbr.htm +7 -7
mce/xhtmlxtras/acronym.htm +7 -7
mce/xhtmlxtras/attributes.htm +6 -6
mce/xhtmlxtras/cite.htm +7 -7
mce/xhtmlxtras/del.htm +7 -7
mce/xhtmlxtras/ins.htm +7 -7
mce/xhtmlxtras/langs/ja_dlg.js +1 -1
readme.txt +5 -2
tadv_admin.php +75 -63
tinymce-advanced.php +1 -1

mce/advhr/langs/ja_dlg.js CHANGED Viewed

	@@ -1 +1 @@
1	- tinyMCE.addI18n('ja.advhr_dlg',{size:"\u9ad8\u3055",noshade:"\u5f71\u306a\u3057",width:"\u5e45",normal:"\~~u666e~~\~~u901a~~",widthunits:"~~Units~~"});


1	+ tinyMCE.addI18n('ja.advhr_dlg',{size:"\u9ad8\u3055",noshade:"\u5f71\u306a\u3057",width:"\u5e45",normal:"\u901a\u5e38",widthunits:"\u5358\u4f4d"});

mce/advhr/rule.htm CHANGED Viewed

	@@ -2,11 +2,11 @@
2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#advhr.advhr_desc}</title>
5	- <script type="text/javascript" src="../../tiny_mce_popup.js?ver=~~345~~"></script>
6	- <script type="text/javascript" src="js/rule.js?ver=~~345~~"></script>
7	- <script type="text/javascript" src="../../utils/mctabs.js?ver=~~345~~"></script>
8	- <script type="text/javascript" src="../../utils/form_utils.js?ver=~~345~~"></script>
9	- <link href="css/advhr.css?ver=~~345~~" rel="stylesheet" type="text/css" />
10	</head>
11	<body role="application">
12	<form onsubmit="AdvHRDialog.update();return false;" action="#">


2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#advhr.advhr_desc}</title>
5	+ <script type="text/javascript" src="../../tiny_mce_popup.js?ver=349"></script>
6	+ <script type="text/javascript" src="js/rule.js?ver=349"></script>
7	+ <script type="text/javascript" src="../../utils/mctabs.js?ver=349"></script>
8	+ <script type="text/javascript" src="../../utils/form_utils.js?ver=349"></script>
9	+ <link href="css/advhr.css?ver=349" rel="stylesheet" type="text/css" />
10	</head>
11	<body role="application">
12	<form onsubmit="AdvHRDialog.update();return false;" action="#">

mce/advimage/image.htm CHANGED Viewed

	@@ -2,13 +2,13 @@
2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#advimage_dlg.dialog_title}</title>
5	- <script type="text/javascript" src="../../tiny_mce_popup.js?ver=~~345~~"></script>
6	- <script type="text/javascript" src="../../utils/mctabs.js?ver=~~345~~"></script>
7	- <script type="text/javascript" src="../../utils/form_utils.js?ver=~~345~~"></script>
8	- <script type="text/javascript" src="../../utils/validate.js?ver=~~345~~"></script>
9	- <script type="text/javascript" src="../../utils/editable_selects.js?ver=~~345~~"></script>
10	- <script type="text/javascript" src="js/image.js?ver=~~345~~"></script>
11	- <link href="css/advimage.css?ver=~~345~~" rel="stylesheet" type="text/css" />
12	</head>
13	<body id="advimage" style="display: none" role="application" aria-labelledby="app_title">
14	<span id="app_title" style="display:none">{#advimage_dlg.dialog_title}</span>


2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#advimage_dlg.dialog_title}</title>
5	+ <script type="text/javascript" src="../../tiny_mce_popup.js?ver=349"></script>
6	+ <script type="text/javascript" src="../../utils/mctabs.js?ver=349"></script>
7	+ <script type="text/javascript" src="../../utils/form_utils.js?ver=349"></script>
8	+ <script type="text/javascript" src="../../utils/validate.js?ver=349"></script>
9	+ <script type="text/javascript" src="../../utils/editable_selects.js?ver=349"></script>
10	+ <script type="text/javascript" src="js/image.js?ver=349"></script>
11	+ <link href="css/advimage.css?ver=349" rel="stylesheet" type="text/css" />
12	</head>
13	<body id="advimage" style="display: none" role="application" aria-labelledby="app_title">
14	<span id="app_title" style="display:none">{#advimage_dlg.dialog_title}</span>

mce/advimage/langs/ja_dlg.js CHANGED Viewed

@@ -1 +1 @@

- tinyMCE.addI18n('ja.advimage_dlg',{"image_list":"\~~u4e00~~\~~u89a7~~\~~u304b~~\~~u3089~~\~~u9078\u3076~~","align_right":"\u53f3\u5bc4\u305b","align_left":"\u5de6\u5bc4\u305b","align_textbottom":"\u30c6\u30ad\u30b9\u30c8\~~u306e~~\u4e0b\u7aef\u63c3\u3048","align_texttop":"\u30c6\u30ad\u30b9\u30c8\~~u306e~~\u4e0a\u7aef\u63c3\u3048","align_bottom":"\u4e0b\u63c3\u3048","align_middle":"\u4e2d\u592e\u63c3\u3048","align_top":"\u4e0a\u63c3\u3048","align_baseline":"\u30d9\u30fc\u30b9\u30e9\u30a4\u30f3\u63c3\u3048",align:"\u914d\u7f6e",hspace:"\u5de6\u53f3\u4f59\u767d",vspace:"\u4e0a\u4e0b\u4f59\u767d",dimensions:"\~~u30b5~~\~~u30a4\u30ba~~",border:"\u67a0\u7dda",list:"\~~u4e00~~\~~u89a7~~\~~u304b~~\~~u3089~~\~~u9078\u3076~~",alt:"\u753b\u50cf\u306e\u8aac\u660e",src:"\u753b\~~u50cfURL~~","dialog_title":"\u753b\u50cf\~~u306e~~\u633f\u5165/\u7de8\u96c6","missing_alt":"\u753b\u50cf\u306e\u8aac\u660e\~~u6587~~\~~u304c~~\~~u5165~~\~~u529b~~\~~u3055~~\~~u308c~~\~~u3066~~\~~u3044\~~u307e\~~u305b~~\~~u3093~~\~~u3002~~\u76ee\u306e\u4e0d\u81ea\u7531\u306a\u65b9\~~u3084~~\u30c6\u30ad\u30b9\u30c8\u30d6\u30e9\u30a6\u30b6\u3092\~~u5229~~\u7528\~~u3055~~\~~u308c\~~u3066\u3044\u308b\u65b9\~~u3078\u914d\u616e\u3057\~~u3001\u753b\u50cf\~~u8aac~~\~~u660e~~\u3092\~~u5165~~\~~u529b~~\~~u3059~~\u308b\~~u3053~~\~~u3068~~\~~u3092~~\~~u304a~~\~~u85a6~~\~~u3081~~\u3057\u307e\~~u3059~~\u3002","example_img":"~~Appearance preview image~~",misc:"\u305d\u306e\u4ed6",mouseout:"\u30de\u30a6\u30b9\~~u30a2~~\~~u30a6~~\~~u30c8~~\u6642",mouseover:"\u30de\u30a6\u30b9\~~u30aa~~\u30fc\~~u30d0~~\~~u30fc~~\u6642","alt_image":"\u753b\u50cf~~\u5207\u66ff\u3092\u884c\u3046~~","swap_image":"\~~u30ed~~\~~u30fc~~\~~u30eb~~\~~u30aa~~\~~u30fc~~\~~u30d0~~\~~u30fc\u52b9\u679c~~",map:"\u30a4\u30e1\u30fc\u30b8\u30de\u30c3\u30d7",id:"ID",rtl:"\u53f3\u304b\u3089\u5de6",ltr:"\u5de6\u304b\u3089\u53f3",classes:"\u30af\u30e9\u30b9",style:"\u30b9\u30bf\u30a4\u30eb","long_desc":"\u8a73\u7d30\u8aac\u660e\u30ea\u30f3\u30af",langcode:"\u8a00\u8a9e\u30b3\u30fc\u30c9",langdir:"\u6587\u7ae0\u306e\u65b9\u5411","constrain_proportions":"\u7e26\u6a2a\u6bd4\u306e\~~u4fdd~~\~~u5b58~~",preview:"\u30d7\u30ec\u30d3\u30e5\u30fc",title:"\u30bf\u30a4\u30c8\u30eb",general:"\u4e00\u822c","tab_advanced":"\u9ad8\u5ea6\u306a\u8a2d\u5b9a","tab_appearance":"\u8868\u793a","tab_general":"\u4e00\u822c",width:"\~~u6a2a\~~u5e45",height:"\u9ad8\u3055"});

+ tinyMCE.addI18n('ja.advimage_dlg',{"image_list":"\u753b\u50cf\u306e\u4e00\u89a7","align_right":"\u53f3\u5bc4\u305b","align_left":"\u5de6\u5bc4\u305b","align_textbottom":"\u30c6\u30ad\u30b9\u30c8\u3092\u4e0b\u7aef\u63c3\u3048","align_texttop":"\u30c6\u30ad\u30b9\u30c8\u3092\u4e0a\u7aef\u63c3\u3048","align_bottom":"\u4e0b\u63c3\u3048","align_middle":"\u4e2d\u592e\u63c3\u3048","align_top":"\u4e0a\u63c3\u3048","align_baseline":"\u30d9\u30fc\u30b9\u30e9\u30a4\u30f3\u63c3\u3048",align:"\u914d\u7f6e",hspace:"\u5de6\u53f3\u306e\u4f59\u767d",vspace:"\u4e0a\u4e0b\u306e\u4f59\u767d",dimensions:"\u5bf8\u6cd5",border:"\u67a0\u7dda",list:"\u753b\u50cf\u306e\u4e00\u89a7",alt:"\u753b\u50cf\u306e\u8aac\u660e",src:"\u753b\u50cf\u306eURL","dialog_title":"\u753b\u50cf\u3092\u633f\u5165/\u7de8\u96c6","missing_alt":"\u753b\u50cf\u306e\u8aac\u660e\u3092\u542b\u3081\u305a\u306b\u7d9a\u3051\u307e\u3059\u304b? \u753b\u50cf\u306e\u8aac\u660e\u304c\u306a\u3044\u3068\u76ee\u306e\u4e0d\u81ea\u7531\u306a\u65b9\u3001\u30c6\u30ad\u30b9\u30c8\u8868\u793a\u3060\u3051\u306e\u30d6\u30e9\u30a6\u30b6\u3092\u4f7f\u7528\u3057\u3066\u3044\u308b\u65b9\u3001\u753b\u50cf\u306e\u8868\u793a\u3092\u6b62\u3081\u3066\u308b\u65b9\u304c\u30a2\u30af\u30bb\u30b9\u3067\u304d\u306a\u3044\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002","example_img":"\u753b\u50cf\u306e\u30d7\u30ec\u30d3\u30e5\u30fc\u306e\u69d8\u5b50",misc:"\u305d\u306e\u4ed6",mouseout:"\u30de\u30a6\u30b9\u30ab\u30fc\u30bd\u30eb\u304c\u5916\u308c\u308b\u6642",mouseover:"\u30de\u30a6\u30b9\u30ab\u30fc\u30bd\u30eb\u304c\u304b\u304b\u308b\u6642","alt_image":"\u5225\u306e\u753b\u50cf","swap_image":"\u753b\u50cf\u306e\u5165\u308c\u66ff\u3048",map:"\u30a4\u30e1\u30fc\u30b8\u30de\u30c3\u30d7",id:"ID",rtl:"\u53f3\u304b\u3089\u5de6",ltr:"\u5de6\u304b\u3089\u53f3",classes:"\u30af\u30e9\u30b9",style:"\u30b9\u30bf\u30a4\u30eb","long_desc":"\u8a73\u7d30\u306a\u8aac\u660e\u306e\u30ea\u30f3\u30af",langcode:"\u8a00\u8a9e\u30b3\u30fc\u30c9",langdir:"\u6587\u7ae0\u306e\u65b9\u5411","constrain_proportions":"\u7e26\u6a2a\u6bd4\u306e\u7dad\u6301",preview:"\u30d7\u30ec\u30d3\u30e5\u30fc",title:"\u30bf\u30a4\u30c8\u30eb",general:"\u4e00\u822c","tab_advanced":"\u9ad8\u5ea6\u306a\u8a2d\u5b9a","tab_appearance":"\u8868\u793a","tab_general":"\u4e00\u822c",width:"\u5e45",height:"\u9ad8\u3055"});

mce/advimage/langs/ru_dlg.js CHANGED Viewed

@@ -1 +1 @@

- tinyMCE.addI18n('ru.advimage_dlg',{"image_list":"\u0421\u043f\u0438\u0441\u043e\u043a \u043a\u0430\u0440\u0442\u0438\u043d\u043e\u043a","align_right":"\u041f\u043e \u043f\u0440\u0430\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e","align_left":"\u041f\u043e \u043b\u0435\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e","align_textbottom":"\u041f\u043e \u043d\u0438\u0436\u043d\u0435\u043c\u0443 \u043a\u0440\u0430\u044e \u0442\u0435\u043a\u0441\u0442\u0430","align_texttop":"\u041f\u043e \u0432\u0435\u0440\u0445\u043d\u0435\u043c\u0443 \u043a\u0440\u0430\u044e \u0442\u0435\u043a\u0441\u0442\u0430","align_bottom":"\u041f\u043e \u043d\u0438\u0436\u043d\u0435\u043c\u0443 \u043a\u0440\u0430\u044e","align_middle":"\u041f\u043e \u0446\u0435\u043d\u0442\u0440\u0443","align_top":"\u041f\u043e \u0432\u0435\u0440\u0445\u043d\u0435\u043c\u0443 \u043a\u0440\u0430\u044e","align_baseline":"\u041f\u043e \u0431\u0430\u0437\u043e\u0432\u043e\u0439 \u043b\u0438\u043d\u0438\u0438",align:"\u0412\u044b\u0440\u0430\u0432\u043d\u0438\u0432\u0430\u043d\u0438\u0435",hspace:"\u0413\u043e\u0440\u0438\u0437. \u043e\u0442\u0441\u0442\u0443\u043f",vspace:"\u0412\u0435\u0440\u0442. \u043e\u0442\u0441\u0442\u0443\u043f",dimensions:"\u0420\u0430\u0437\u043c\u0435\u0440",border:"\u0413\u0440\u0430\u043d\u0438\u0446\u0430",list:"\u0421\u043f\u0438\u0441\u043e\u043a",alt:"\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",src:"\u0410\u0434\u0440\u0435\u0441","dialog_title":"\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f","missing_alt":"\u041f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c \u0431\u0435\u0437 \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u044f? \u0411\u0435\u0437 \u044d\u0442\u043e\u0433\u043e \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u0431\u0443\u0434\u0435\u0442 \u043d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u043d\u043e \u043d\u0435\u043a\u043e\u0442\u043e\u0440\u044b\u043c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f\u043c.","example_img":"\u041f\u0440\u0438\u043c\u0435\u0440 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f",misc:"\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b",mouseout:"\u0412 \u043f\u043e\u043a\u043e\u0435",mouseover:"\u041f\u0440\u0438 \u043d\u0430\u0432\u0435\u0434\u0435\u043d\u0438\u0438","alt_image":"\u0410\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u043e\u0435 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435","swap_image":"\u0414\u0438\u043d\u0430\u043c\u0438\u0447\u0435\u0441\u043a\u043e\u0435 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",map:"\u041a\u0430\u0440\u0442\u0430 \u0441\u0441\u044b\u043b\u043e\u043a",id:"\u0418\u043c\u044f \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430",rtl:"\u0421\u043f\u0440\u0430\u0432\u0430 \u043d\u0430\u043b\u0435\u0432\u043e",ltr:"\u0421\u043b\u0435\u0432\u0430 \u043d\u0430\u043f\u0440\u0430\u0432\u043e",classes:"\u041a\u043b\u0430\u0441\u0441\u044b",style:"\u0421\u0442\u0438\u043b\u044c","long_desc":"\u0421\u0441\u044b\u043b\u043a\u0430 \u043d\u0430 \u043f\u043e\u043b\u043d\u043e\u0435 \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",langcode:"\u041a\u043e\u0434 \u044f\u0437\u044b\u043a\u0430",langdir:"\u041d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0442\u0435\u043a\u0441\u0442\u0430","constrain_proportions":"\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043f\u0440\u043e\u043f\u043e\u0440\u0446\u0438\u0438",preview:"\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440",title:"\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",general:"\u041e\u0431\u0449\u0438\u0435 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b","tab_advanced":"\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e","tab_appearance":"\u041f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435","tab_general":"\u041e\u0431\u0449\u0435\u0435",width:"\u0428\u0438\u0440\u0438\u043d\u0430",height:"\u0412\u044b\u0441\u043e\u0442\u0430"});

+ tinyMCE.addI18n('ru.advimage_dlg',{"image_list":"\u0421\u043f\u0438\u0441\u043e\u043a \u043a\u0430\u0440\u0442\u0438\u043d\u043e\u043a","align_right":"\u041f\u043e \u043f\u0440\u0430\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e","align_left":"\u041f\u043e \u043b\u0435\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e","align_textbottom":"\u041f\u043e \u043d\u0438\u0436\u043d\u0435\u043c\u0443 \u043a\u0440\u0430\u044e \u0442\u0435\u043a\u0441\u0442\u0430","align_texttop":"\u041f\u043e \u0432\u0435\u0440\u0445\u043d\u0435\u043c\u0443 \u043a\u0440\u0430\u044e \u0442\u0435\u043a\u0441\u0442\u0430","align_bottom":"\u041f\u043e \u043d\u0438\u0436\u043d\u0435\u043c\u0443 \u043a\u0440\u0430\u044e","align_middle":"\u041f\u043e \u0446\u0435\u043d\u0442\u0440\u0443","align_top":"\u041f\u043e \u0432\u0435\u0440\u0445\u043d\u0435\u043c\u0443 \u043a\u0440\u0430\u044e","align_baseline":"\u041f\u043e \u0431\u0430\u0437\u043e\u0432\u043e\u0439 \u043b\u0438\u043d\u0438\u0438",align:"\u0412\u044b\u0440\u0430\u0432\u043d\u0438\u0432\u0430\u043d\u0438\u0435",hspace:"\u0413\u043e\u0440\u0438\u0437. \u043e\u0442\u0441\u0442\u0443\u043f",vspace:"\u0412\u0435\u0440\u0442. \u043e\u0442\u0441\u0442\u0443\u043f",dimensions:"\u0420\u0430\u0437\u043c\u0435\u0440",border:"\u0413\u0440\u0430\u043d\u0438\u0446\u0430",list:"\u0421\u043f\u0438\u0441\u043e\u043a",alt:"\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",src:"\u0410\u0434\u0440\u0435\u0441","dialog_title":"\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f","missing_alt":"\u041f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c \u0431\u0435\u0437 \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u044f? \u0411\u0435\u0437 \u044d\u0442\u043e\u0433\u043e \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u0431\u0443\u0434\u0435\u0442 \u043d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u043d\u043e \u043d\u0435\u043a\u043e\u0442\u043e\u0440\u044b\u043c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f\u043c \u0441 \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u043d\u044b\u043c\u0438 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044f\u043c\u0438 \u0438\u043b\u0438 \u0442\u0435\u043c, \u043a\u0442\u043e \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442 \u0442\u0435\u043a\u0441\u0442\u043e\u0432\u044b\u0435 \u0431\u0440\u0430\u0443\u0437\u0435\u0440\u044b \u0438\u043b\u0438 \u043e\u0442\u043a\u0440\u044b\u0432\u0430\u0435\u0442 \u0441\u0430\u0439\u0442\u044b \u0441 \u043e\u0442\u043a\u043b\u044e\u0447\u0435\u043d\u043d\u044b\u043c\u0438 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f\u043c\u0438.","example_img":"\u041f\u0440\u0438\u043c\u0435\u0440 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f",misc:"\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b",mouseout:"\u0412 \u043f\u043e\u043a\u043e\u0435",mouseover:"\u041f\u0440\u0438 \u043d\u0430\u0432\u0435\u0434\u0435\u043d\u0438\u0438","alt_image":"\u0410\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u043e\u0435 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435","swap_image":"\u0414\u0438\u043d\u0430\u043c\u0438\u0447\u0435\u0441\u043a\u043e\u0435 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",map:"\u041a\u0430\u0440\u0442\u0430 \u0441\u0441\u044b\u043b\u043e\u043a",id:"\u0418\u043c\u044f \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430",rtl:"\u0421\u043f\u0440\u0430\u0432\u0430 \u043d\u0430\u043b\u0435\u0432\u043e",ltr:"\u0421\u043b\u0435\u0432\u0430 \u043d\u0430\u043f\u0440\u0430\u0432\u043e",classes:"\u041a\u043b\u0430\u0441\u0441\u044b",style:"\u0421\u0442\u0438\u043b\u044c","long_desc":"\u0421\u0441\u044b\u043b\u043a\u0430 \u043d\u0430 \u043f\u043e\u043b\u043d\u043e\u0435 \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",langcode:"\u041a\u043e\u0434 \u044f\u0437\u044b\u043a\u0430",langdir:"\u041d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0442\u0435\u043a\u0441\u0442\u0430","constrain_proportions":"\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043f\u0440\u043e\u043f\u043e\u0440\u0446\u0438\u0438",preview:"\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440",title:"\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",general:"\u041e\u0431\u0449\u0438\u0435 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b","tab_advanced":"\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e","tab_appearance":"\u041f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435","tab_general":"\u041e\u0431\u0449\u0435\u0435",width:"\u0428\u0438\u0440\u0438\u043d\u0430",height:"\u0412\u044b\u0441\u043e\u0442\u0430"});

mce/advlink/js/advlink.js CHANGED Viewed

	@@ -54,6 +54,13 @@ function init() {
54	document.getElementById('popupurl').style.width = '180px';
55
56	elm = inst.dom.getParent(elm, "A");







57	if (elm != null && elm.nodeName == "A")
58	action = "update";
59
	@@ -503,7 +510,7 @@ function getTargetListHTML(elm_id, target_form_element) {
503	var targets = tinyMCEPopup.getParam('theme_advanced_link_targets', '').split(';');
504	var html = '';
505
506	- html += '<select id="' + elm_id + '" name="' + elm_id + '" ~~onf2ocus~~="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target_form_element + '.value=';
507	html += 'this.options[this.selectedIndex].value;">';
508	html += '<option value="_self">' + tinyMCEPopup.getLang('advlink_dlg.target_same') + '</option>';
509	html += '<option value="_blank">' + tinyMCEPopup.getLang('advlink_dlg.target_blank') + ' (_blank)</option>';


54	document.getElementById('popupurl').style.width = '180px';
55
56	elm = inst.dom.getParent(elm, "A");
57	+ if (elm == null) {
58	+ var prospect = inst.dom.create("p", null, inst.selection.getContent());
59	+ if (prospect.childNodes.length === 1) {
60	+ elm = prospect.firstChild;
61	+ }
62	+ }
63	+
64	if (elm != null && elm.nodeName == "A")
65	action = "update";
66

510	var targets = tinyMCEPopup.getParam('theme_advanced_link_targets', '').split(';');
511	var html = '';
512
513	+ html += '<select id="' + elm_id + '" name="' + elm_id + '" onfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target_form_element + '.value=';
514	html += 'this.options[this.selectedIndex].value;">';
515	html += '<option value="_self">' + tinyMCEPopup.getLang('advlink_dlg.target_same') + '</option>';
516	html += '<option value="_blank">' + tinyMCEPopup.getLang('advlink_dlg.target_blank') + ' (_blank)</option>';

mce/advlink/langs/ja_dlg.js CHANGED Viewed

@@ -1 +1 @@

- tinyMCE.addI18n('ja.advlink_dlg',{"target_name":"\u30bf\u30fc\u30b2\u30c3\u30c8\u540d",classes:"\u30af\u30e9\u30b9",style:"\u30b9\u30bf\u30a4\u30eb",id:"ID","popup_position":"\u4f4d\u7f6e (X/Y)",langdir:"\u6587\u7ae0\u306e\u65b9\u5411","popup_size":"\~~u30b5~~\~~u30a4~~\~~u30ba~~","popup_dependent":"~~Dependent~~ (Mozilla~~/Firefox~~\~~u306e~~\~~u307f~~)","popup_resizable":"\u30a6\u30a4\u30f3\u30c9\u30a6\u306e\u30b5\u30a4\u30ba\u5909\u66f4\u3092\u8a31\u53ef~~\u3059\u308b~~","popup_location":"\u30a2\u30c9\u30ec\u30b9\u30d0\u30fc\u3092\u8868\u793a","popup_menubar":"\u30e1\u30cb\u30e5\u30fc\u30d0\u30fc\u3092\u8868\u793a","popup_toolbar":"\u30c4\u30fc\u30eb\u30d0\u30fc\u3092\u8868\u793a","popup_statusbar":"\u30b9\u30c6\u30fc\u30bf\u30b9\u30d0\u30fc\u3092\u8868\u793a","popup_scrollbars":"\u30b9\u30af\u30ed\u30fc\u30eb\u30d0\u30fc\u3092\u8868\u793a","popup_return":"\'return false\'\u3092\u633f\u5165~~\u3059\u308b~~","popup_name":"\u30a6\u30a4\u30f3\u30c9\u30a6\u540d","popup_url":"\u30dd\u30c3\u30d7\u30a2\u30c3\~~u30d7URL~~",popup:"Javascript\u30dd\u30c3\u30d7\u30a2\u30c3\u30d7","target_blank":"\u65b0\u3057\u3044\u30a6\u30a4\u30f3\u30c9\u30a6\u3067\u958b\u304f","target_top":"\u30c8\u30c3\u30d7\u306e\u30d5\u30ec\u30fc\u30e0\u3067\u958b\u304f","target_parent":"\u89aa\u30a6\u30a4\u30f3\u30c9\u30a6/\u89aa\u30d5\u30ec\u30fc\u30e0\u3067\u958b\u304f","target_same":"\u3053\u306e\u30a6\u30a4\u30f3\u30c9\u30a6/\u30d5\u30ec\u30fc\u30e0\u3067\u958b\u304f","anchor_names":"\u30a2\u30f3\u30ab\u30fc","popup_opts":"\u30aa\u30d7\u30b7\u30e7\u30f3","advanced_props":"\u9ad8\u5ea6\u306a\~~u8a2d~~\~~u5b9a~~","event_props":"\u30a4\u30d9\u30f3\u30c8","popup_props":"\u30dd\u30c3\u30d7\u30a2\u30c3\u30d7","general_props":"\u4e00\u822c","advanced_tab":"\~~u4e0a~~\~~u7d1a~~\~~u8005\u5411\u3051~~","events_tab":"\u30a4\u30d9\u30f3\u30c8","popup_tab":"\u30dd\u30c3\u30d7\u30a2\u30c3\u30d7","general_tab":"\u4e00\u822c",list:"\~~u4e00~~\~~u89a7~~\~~u304b~~\~~u3089~~\~~u9078~~\~~u3076~~","is_external":"\u30ea\u30f3\u30af\~~u306bhttp://\~~u3092\~~u4ed8~~\u52a0\u3057\u307e\u3059\u304b~~\uff1f~~","is_email":"\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\~~u304c~~\~~u5165~~\~~u529b~~\~~u3055~~\~~u308c~~\~~u307e\u3057\u305f\~~u3002\u30ea\u30f3\u30af\~~u306bmailto:\~~u3092\~~u4ed8~~\u52a0\u3057\u307e\u3059\u304b~~\uff1f~~",titlefield:"\u30bf\u30a4\u30c8\u30eb",target:"\u30bf\u30fc\u30b2\u30c3\u30c8",url:"\u30ea\u30f3\~~u30afURL~~",title:"\u30ea\u30f3\u30af\u306e\u633f\u5165/\u7de8\u96c6","link_list":"\~~u4e00~~\~~u89a7~~\~~u304b~~\~~u3089~~\~~u9078~~\~~u3076~~",rtl:"\u53f3\u304b\u3089\u5de6",ltr:"\u5de6\u304b\u3089\u53f3",accesskey:"\u30a2\u30af\u30bb\u30b9\u30ad\u30fc",tabindex:"\u30bf\u30d6\u30a4\u30f3\u30c7\u30c3\u30af\u30b9",rev:"\u30bf\u30fc\u30b2\u30c3\u30c8\~~u306e~~\~~u3053~~\~~u306e\~~u30da\u30fc\u30b8\~~u306b~~\~~u5bfe\u3059\u308b\~~u95a2\u4fc2",rel:"\~~u3053\u306e\~~u30da\u30fc\u30b8\~~u306e~~\u30bf\u30fc\u30b2\u30c3\u30c8\~~u306b~~\~~u5bfe\u3059\u308b\~~u95a2\u4fc2",mime:"\u30bf\u30fc\u30b2\u30c3\u30c8\u306eMIME\u30bf\u30a4\u30d7",encoding:"\u30bf\u30fc\u30b2\u30c3\u30c8\u306e\u6587\u5b57\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0",langcode:"\u8a00\u8a9e\u30b3\u30fc\u30c9","target_langcode":"\u30bf\u30fc\u30b2\u30c3\u30c8\u306e\u8a00\u8a9e",width:"\~~u6a2a\~~u5e45",height:"\u9ad8\u3055"});

+ tinyMCE.addI18n('ja.advlink_dlg',{"target_name":"\u30bf\u30fc\u30b2\u30c3\u30c8\u306e\u540d\u524d",classes:"\u30af\u30e9\u30b9",style:"\u30b9\u30bf\u30a4\u30eb",id:"ID","popup_position":"\u4f4d\u7f6e (X/Y)",langdir:"\u6587\u7ae0\u306e\u65b9\u5411","popup_size":"\u5927\u304d\u3055","popup_dependent":"\u4f9d\u5b58(Mozilla\u3068Firefox\u3060\u3051)","popup_resizable":"\u30a6\u30a4\u30f3\u30c9\u30a6\u306e\u30b5\u30a4\u30ba\u5909\u66f4\u3092\u8a31\u53ef","popup_location":"\u30a2\u30c9\u30ec\u30b9\u30d0\u30fc\u3092\u8868\u793a","popup_menubar":"\u30e1\u30cb\u30e5\u30fc\u30d0\u30fc\u3092\u8868\u793a","popup_toolbar":"\u30c4\u30fc\u30eb\u30d0\u30fc\u3092\u8868\u793a","popup_statusbar":"\u30b9\u30c6\u30fc\u30bf\u30b9\u30d0\u30fc\u3092\u8868\u793a","popup_scrollbars":"\u30b9\u30af\u30ed\u30fc\u30eb\u30d0\u30fc\u3092\u8868\u793a","popup_return":"\'return false\'\u3092\u633f\u5165","popup_name":"\u30a6\u30a4\u30f3\u30c9\u30a6\u306e\u540d\u524d","popup_url":"\u30dd\u30c3\u30d7\u30a2\u30c3\u30d7\u306eURL",popup:"Javascript\u30dd\u30c3\u30d7\u30a2\u30c3\u30d7","target_blank":"\u65b0\u3057\u3044\u30a6\u30a4\u30f3\u30c9\u30a6\u3067\u958b\u304f","target_top":"\u30c8\u30c3\u30d7\u306e\u30d5\u30ec\u30fc\u30e0\u3067\u958b\u304f(\u3059\u3079\u3066\u306e\u30d5\u30ec\u30fc\u30e0\u3092\u7f6e\u304d\u63db\u3048)","target_parent":"\u89aa\u30a6\u30a4\u30f3\u30c9\u30a6/\u89aa\u30d5\u30ec\u30fc\u30e0\u3067\u958b\u304f","target_same":"\u3053\u306e\u30a6\u30a4\u30f3\u30c9\u30a6/\u30d5\u30ec\u30fc\u30e0\u3067\u958b\u304f","anchor_names":"\u30a2\u30f3\u30ab\u30fc","popup_opts":"\u30aa\u30d7\u30b7\u30e7\u30f3","advanced_props":"\u9ad8\u5ea6\u306a\u5c5e\u6027","event_props":"\u30a4\u30d9\u30f3\u30c8","popup_props":"\u30dd\u30c3\u30d7\u30a2\u30c3\u30d7","general_props":"\u4e00\u822c","advanced_tab":"\u5c02\u9580\u7684","events_tab":"\u30a4\u30d9\u30f3\u30c8","popup_tab":"\u30dd\u30c3\u30d7\u30a2\u30c3\u30d7","general_tab":"\u4e00\u822c",list:"\u30ea\u30f3\u30af\u306e\u4e00\u89a7","is_external":"\u5165\u529b\u3057\u305fURL\u306f\u5916\u90e8\u306e\u30ea\u30f3\u30af\u306e\u3088\u3046\u3067\u3059\u3002\u30ea\u30f3\u30af\u306b http:// \u3092\u8ffd\u52a0\u3057\u307e\u3059\u304b?","is_email":"\u5165\u529b\u3057\u305fURL\u306f\u96fb\u5b50\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u306e\u3088\u3046\u3067\u3059\u3002\u30ea\u30f3\u30af\u306b mailto: \u3092\u8ffd\u52a0\u3057\u307e\u3059\u304b?",titlefield:"\u30bf\u30a4\u30c8\u30eb",target:"\u30bf\u30fc\u30b2\u30c3\u30c8",url:"\u30ea\u30f3\u30af\u306eURL",title:"\u30ea\u30f3\u30af\u306e\u633f\u5165/\u7de8\u96c6","link_list":"\u30ea\u30f3\u30af\u306e\u4e00\u89a7",rtl:"\u53f3\u304b\u3089\u5de6",ltr:"\u5de6\u304b\u3089\u53f3",accesskey:"\u30a2\u30af\u30bb\u30b9\u30ad\u30fc",tabindex:"\u30bf\u30d6\u30a4\u30f3\u30c7\u30c3\u30af\u30b9",rev:"\u30bf\u30fc\u30b2\u30c3\u30c8\u304b\u3089\u30da\u30fc\u30b8\u306e\u95a2\u4fc2",rel:"\u30da\u30fc\u30b8\u304b\u3089\u30bf\u30fc\u30b2\u30c3\u30c8\u306e\u95a2\u4fc2",mime:"\u30bf\u30fc\u30b2\u30c3\u30c8\u306eMIME\u30bf\u30a4\u30d7",encoding:"\u30bf\u30fc\u30b2\u30c3\u30c8\u306e\u6587\u5b57\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0",langcode:"\u8a00\u8a9e\u30b3\u30fc\u30c9","target_langcode":"\u30bf\u30fc\u30b2\u30c3\u30c8\u306e\u8a00\u8a9e",width:"\u5e45",height:"\u9ad8\u3055"});

mce/advlink/link.htm CHANGED Viewed

	@@ -2,12 +2,12 @@
2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#advlink_dlg.title}</title>
5	- <script type="text/javascript" src="../../tiny_mce_popup.js?ver=~~345~~"></script>
6	- <script type="text/javascript" src="../../utils/mctabs.js?ver=~~345~~"></script>
7	- <script type="text/javascript" src="../../utils/form_utils.js?ver=~~345~~"></script>
8	- <script type="text/javascript" src="../../utils/validate.js?ver=~~345~~"></script>
9	- <script type="text/javascript" src="js/advlink.js?ver=~~345~~"></script>
10	- <link href="css/advlink.css?ver=~~345~~" rel="stylesheet" type="text/css" />
11	</head>
12	<body id="advlink" style="display: none" role="application" onload="javascript:mcTabs.displayTab('general_tab','general_panel', true);" aria-labelledby="app_label">
13	<span class="mceVoiceLabel" id="app_label" style="display:none;">{#advlink_dlg.title}</span>


2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#advlink_dlg.title}</title>
5	+ <script type="text/javascript" src="../../tiny_mce_popup.js?ver=349"></script>
6	+ <script type="text/javascript" src="../../utils/mctabs.js?ver=349"></script>
7	+ <script type="text/javascript" src="../../utils/form_utils.js?ver=349"></script>
8	+ <script type="text/javascript" src="../../utils/validate.js?ver=349"></script>
9	+ <script type="text/javascript" src="js/advlink.js?ver=349"></script>
10	+ <link href="css/advlink.css?ver=349" rel="stylesheet" type="text/css" />
11	</head>
12	<body id="advlink" style="display: none" role="application" onload="javascript:mcTabs.displayTab('general_tab','general_panel', true);" aria-labelledby="app_label">
13	<span class="mceVoiceLabel" id="app_label" style="display:none;">{#advlink_dlg.title}</span>

mce/contextmenu/editor_plugin.js CHANGED Viewed

@@ -1 +1 @@

- (function(){var a=tinymce.dom.Event,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.ContextMenu",{init:function(e){var h=this,f,d,i;h.editor=e;d=e.settings.contextmenu_never_use_native;h.onContextMenu=new tinymce.util.Dispatcher(this);f=e.onContextMenu.add(function(j,k){if((i!==0?i:k.ctrlKey)&&!d){return}a.cancel(k);if(k.target.nodeName=="IMG"){j.selection.select(k.target)}h._getMenu(j).showMenu(k.clientX||k.pageX,k.clientY||k.pageY);a.add(j.getDoc(),"click",function(l){g(j,l)});j.nodeChanged()});e.onRemove.add(function(){if(h._menu){h._menu.removeAll()}});function g(j,k){i=0;if(k&&k.button==2){i=k.ctrlKey;return}if(h._menu){h._menu.removeAll();h._menu.destroy();a.remove(j.getDoc(),"click",g)}}e.onMouseDown.add(g);e.onKeyDown.add(g);e.onKeyDown.add(function(j,k){if(k.shiftKey&&!k.ctrlKey&&!k.altKey&&k.keyCode===121){a.cancel(k);f(j,k)}})},getInfo:function(){return{longname:"Contextmenu",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_getMenu:function(e){var g=this,d=g._menu,j=e.selection,f=j.isCollapsed(),h=j.getNode()||e.getBody(),i,k;if(d){d.removeAll();d.destroy()}k=b.getPos(e.getContentAreaContainer());d=e.controlManager.createDropMenu("contextmenu",{offset_x:k.x+e.getParam("contextmenu_offset_x",0),offset_y:k.y+e.getParam("contextmenu_offset_y",0),constrain:1,keyboard_focus:true});g._menu=d;d.add({title:"advanced.cut_desc",icon:"cut",cmd:"Cut"}).setDisabled(f);d.add({title:"advanced.copy_desc",icon:"copy",cmd:"Copy"}).setDisabled(f);d.add({title:"advanced.paste_desc",icon:"paste",cmd:"Paste"});if((h.nodeName=="A"&&!e.dom.getAttrib(h,"name"))||!f){d.addSeparator();d.add({title:"advanced.link_desc",icon:"link",cmd:e.plugins.advlink?"mceAdvLink":"mceLink",ui:true});d.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"})}d.addSeparator();d.add({title:"advanced.image_desc",icon:"image",cmd:e.plugins.advimage?"mceAdvImage":"mceImage",ui:true});d.addSeparator();i=d.addMenu({title:"contextmenu.align"});i.add({title:"contextmenu.left",icon:"justifyleft",cmd:"JustifyLeft"});i.add({title:"contextmenu.center",icon:"justifycenter",cmd:"JustifyCenter"});i.add({title:"contextmenu.right",icon:"justifyright",cmd:"JustifyRight"});i.add({title:"contextmenu.full",icon:"justifyfull",cmd:"JustifyFull"});g.onContextMenu.dispatch(g,d,h,f);return d}});tinymce.PluginManager.add("contextmenu",tinymce.plugins.ContextMenu)})();

mce/layer/editor_plugin.js CHANGED Viewed

@@ -1 +1 @@

- (function(){tinymce.create("tinymce.plugins.Layer",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceInsertLayer",c._insertLayer,c);a.addCommand("mceMoveForward",function(){c._move(1)});a.addCommand("mceMoveBackward",function(){c._move(-1)});a.addCommand("mceMakeAbsolute",function(){c._toggleAbsolute()});a.addButton("moveforward",{title:"layer.forward_desc",cmd:"mceMoveForward"});a.addButton("movebackward",{title:"layer.backward_desc",cmd:"mceMoveBackward"});a.addButton("absolute",{title:"layer.absolute_desc",cmd:"mceMakeAbsolute"});a.addButton("insertlayer",{title:"layer.insertlayer_desc",cmd:"mceInsertLayer"});a.onInit.add(function(){if(tinymce.isIE){a.getDoc().execCommand("2D-Position",false,true)}});a.onNodeChange.add(c._nodeChange,c);a.onVisualAid.add(c._visualAid,c)},getInfo:function(){return{longname:"Layer",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/layer",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(b,~~a,e~~){var c,d;c=this._getParentLayer(e);d=b.dom.getParent(e,"DIV,P,IMG");if(!d){a.setDisabled("absolute",1);a.setDisabled("moveforward",1);a.setDisabled("movebackward",1)}else{a.setDisabled("absolute",0);a.setDisabled("moveforward",!c);a.setDisabled("movebackward",!c);a.setActive("absolute",c&&c.style.position.toLowerCase()=="absolute")}},_visualAid:function(a,c,b){var d=a.dom;tinymce.each(d.select("div,p",c),function(f){if(/^(absolute|relative|~~static~~)$/i.test(f.style.position)){if(b){d.addClass(f,"mceItemVisualAid")}else{d.removeClass(f,"mceItemVisualAid")}}})},_move:function(h){var b=this.editor,f,g=[],e=this._getParentLayer(b.selection.getNode()),c=-1,j=-1,a;a=[];tinymce.walk(b.getBody(),function(d){if(d.nodeType==1&&/^(absolute|relative|static)$/i.test(d.style.position)){a.push(d)}},"childNodes");for(f=0;f<a.length;f++){g[f]=a[f].style.zIndex?parseInt(a[f].style.zIndex):0;if(c<0&&a[f]==e){c=f}}if(h<0){for(f=0;f<g.length;f++){if(g[f]<g[c]){j=f;break}}if(j>-1){a[c].style.zIndex=g[j];a[j].style.zIndex=g[c]}else{if(g[c]>0){a[c].style.zIndex=g[c]-1}}}else{for(f=0;f<g.length;f++){if(g[f]>g[c]){j=f;break}}if(j>-1){a[c].style.zIndex=g[j];a[j].style.zIndex=g[c]}else{a[c].style.zIndex=g[c]+1}}b.execCommand("mceRepaint")},_getParentLayer:function(a){return this.editor.dom.getParent(a,function(b){return b.nodeType==1&&/^(absolute|relative|static)$/i.test(b.style.position)})},_insertLayer:function(){var a=this.editor,b=a.dom.getPos(a.~~dom.~~getParent(a.selection.getNode(),"*"));a.dom.add(~~a.getBody()~~,"div",{style:{position:"absolute",left:b.x,top:(b.y>20?b.y:20),width:100,height:100},"class":"mceItemVisualAid"},a.selection.getContent()||a.getLang("layer.content"))},_toggleAbsolute:function(){var a=this.editor,b=this._getParentLayer(a.selection.getNode());if(!b){b=a.dom.getParent(a.selection.getNode(),"DIV,P,IMG")}if(b){if(b.style.position.toLowerCase()=="absolute"){a.dom.setStyles(b,{position:"",left:"",top:"",width:"",height:""});a.dom.removeClass(b,"mceItemVisualAid")}else{if(b.style.left==""){b.style.left=20+"px"}if(b.style.top==""){b.style.top=20+"px"}if(b.style.width==""){b.style.width=b.width?(b.width+"px"):"100px"}if(b.style.height==""){b.style.height=b.height?(b.height+"px"):"100px"}b.style.position="absolute";a.dom.setAttrib(b,"data-mce-style","");a.addVisual(a.getBody())}a.execCommand("mceRepaint");a.nodeChanged()}}});tinymce.PluginManager.add("layer",tinymce.plugins.Layer)})();

mce/searchreplace/langs/ja_dlg.js CHANGED Viewed

@@ -1 +1 @@

- tinyMCE.addI18n('ja.searchreplace_dlg',{findwhat:"\u691c\u7d22\u6587\u5b57\u5217",replacewith:"\u7f6e\u63db\u6587\u5b57\u5217",direction:"\u65b9\u5411",up:"\u4e0a\u3078",down:"\u4e0b\u3078",mcase:"\u5927\u6587\u5b57/\u5c0f\u6587\u5b57\~~u3092~~\u533a\u5225~~\u3059\u308b~~",findnext:"\u6b21\~~u3078~~",allreplaced:"\~~u5168~~\u3066\u7f6e\u63db\~~u3055~~\~~u308c\~~u307e\u3057\u305f\u3002","searchnext_desc":"\u518d\u691c\u7d22",notfound:"\~~u6700~~\~~u5f8c~~\~~u307e~~\~~u3067~~\~~u691c~~\~~u7d22\~~u3057\u307e\u3057\u305f\~~u304c~~\~~u3001\~~u691c\u7d22\u6587\u5b57\u5217\~~u304c~~\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002","search_title":"\u691c\u7d22","replace_title":"\u691c\u7d22/\u7f6e\u63db",replaceall:"\~~u5168~~\u3066\u7f6e\u63db",replace:"\u7f6e\u63db"});

+ tinyMCE.addI18n('ja.searchreplace_dlg',{findwhat:"\u691c\u7d22\u3059\u308b\u6587\u5b57\u5217",replacewith:"\u7f6e\u63db\u5f8c\u306e\u6587\u5b57\u5217",direction:"\u65b9\u5411",up:"\u4e0a\u3078",down:"\u4e0b\u3078",mcase:"\u5927\u6587\u5b57\u30fb\u5c0f\u6587\u5b57\u306e\u533a\u5225",findnext:"\u6b21\u3092\u691c\u7d22",allreplaced:"\u3059\u3079\u3066\u7f6e\u63db\u3057\u307e\u3057\u305f\u3002","searchnext_desc":"\u518d\u691c\u7d22",notfound:"\u691c\u7d22\u3092\u5b8c\u4e86\u3057\u307e\u3057\u305f\u3002\u691c\u7d22\u6587\u5b57\u5217\u306f\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002","search_title":"\u691c\u7d22","replace_title":"\u691c\u7d22\u3068\u7f6e\u63db",replaceall:"\u3059\u3079\u3066\u7f6e\u63db",replace:"\u7f6e\u63db"});

mce/searchreplace/searchreplace.htm CHANGED Viewed

	@@ -2,11 +2,11 @@
2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#searchreplace_dlg.replace_title}</title>
5	- <script type="text/javascript" src="../../tiny_mce_popup.js?ver=~~345~~"></script>
6	- <script type="text/javascript" src="../../utils/mctabs.js?ver=~~345~~"></script>
7	- <script type="text/javascript" src="../../utils/form_utils.js?ver=~~345~~"></script>
8	- <script type="text/javascript" src="js/searchreplace.js?ver=~~345~~"></script>
9	- <link rel="stylesheet" type="text/css" href="css/searchreplace.css?ver=~~345~~" />
10	</head>
11	<body style="display:none;" role="application" aria-labelledby="app_title">
12	<span id="app_title" style="display:none">{#searchreplace_dlg.replace_title}</span>


2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#searchreplace_dlg.replace_title}</title>
5	+ <script type="text/javascript" src="../../tiny_mce_popup.js?ver=349"></script>
6	+ <script type="text/javascript" src="../../utils/mctabs.js?ver=349"></script>
7	+ <script type="text/javascript" src="../../utils/form_utils.js?ver=349"></script>
8	+ <script type="text/javascript" src="js/searchreplace.js?ver=349"></script>
9	+ <link rel="stylesheet" type="text/css" href="css/searchreplace.css?ver=349" />
10	</head>
11	<body style="display:none;" role="application" aria-labelledby="app_title">
12	<span id="app_title" style="display:none">{#searchreplace_dlg.replace_title}</span>

mce/style/js/props.js CHANGED Viewed

	@@ -144,6 +144,8 @@ function setupFormData() {
144	f.text_overline.checked = inStr(ce.style.textDecoration, 'overline');
145	f.text_linethrough.checked = inStr(ce.style.textDecoration, 'line-through');
146	f.text_blink.checked = inStr(ce.style.textDecoration, 'blink');


147
148	// Setup background fields
149
	@@ -632,4 +634,17 @@ function synch(fr, to) {
632	selectByValue(f, to + "_measurement", f.elements[fr + "_measurement"].value);
633	}
634













635	tinyMCEPopup.onInit.add(init);


144	f.text_overline.checked = inStr(ce.style.textDecoration, 'overline');
145	f.text_linethrough.checked = inStr(ce.style.textDecoration, 'line-through');
146	f.text_blink.checked = inStr(ce.style.textDecoration, 'blink');
147	+ f.text_none.checked = inStr(ce.style.textDecoration, 'none');
148	+ updateTextDecorations();
149
150	// Setup background fields
151

634	selectByValue(f, to + "_measurement", f.elements[fr + "_measurement"].value);
635	}
636
637	+ function updateTextDecorations(){
638	+ var el = document.forms[0].elements;
639	+
640	+ var textDecorations = ["text_underline", "text_overline", "text_linethrough", "text_blink"];
641	+ var noneChecked = el["text_none"].checked;
642	+ tinymce.each(textDecorations, function(id) {
643	+ el[id].disabled = noneChecked;
644	+ if (noneChecked) {
645	+ el[id].checked = false;
646	+ }
647	+ });
648	+ }
649	+
650	tinyMCEPopup.onInit.add(init);

mce/style/langs/ja_dlg.js CHANGED Viewed

@@ -1 +1 @@

- tinyMCE.addI18n('ja.style_dlg',{"text_lineheight":"\u884c\u306e\u9ad8\u3055","text_variant":"\u5909\u5f62","text_style":"\u30b9\u30bf\u30a4\u30eb","text_weight":"\u592a\u3055","text_size":"\~~u30b5~~\~~u30a4~~\~~u30ba~~","text_font":"\u30d5\u30a9\u30f3\u30c8","text_props":"\u30c6\u30ad\u30b9\u30c8","positioning_tab":"\~~u30dd~~\~~u30b8\u30b7\u30e7\u30f3~~","list_tab":"\~~u30ea~~\~~u30b9~~\~~u30c8~~","border_tab":"\u67a0\u7dda","box_tab":"\u30dc\u30c3\u30af\u30b9","block_tab":"\u30d6\u30ed\u30c3\u30af","background_tab":"\u80cc\u666f","text_tab":"\u6587\u5b57",apply:"\u9069\u7528",title:"CSS\u306e\u30b9\u30bf\u30a4\u30eb\u3092\u7de8\u96c6",clip:"\u5207\u308a\u629c\u304d",placement:"\u914d\u7f6e",overflow:"\u30aa\u30fc\u30d0\u30fc\u30d5\u30ed\u30fc",zindex:"Z-index",visibility:"\~~u8868~~\~~u793a~~","positioning_type":"\u914d\u7f6e\u65b9\u6cd5",position:"\~~u30de\u30fc\u30ab\u30fc\~~u8868\u793a\u4f4d\u7f6e","bullet_image":"\~~u30de~~\~~u30fc~~\~~u30ab~~\~~u30fc\u753b\u50cf~~","list_type":"\~~u30de~~\~~u30fc~~\~~u30ab~~\~~u30fc~~\u7a2e\u985e",color:"\u8272",height:"\u9ad8\u3055",width:"\u5e45",style:"\u30b9\u30bf\u30a4\u30eb",margin:"\u30de\u30fc\u30b8\u30f3",left:"\u5de6",bottom:"\u4e0b",right:"\u53f3",top:"\u4e0a",same:"\~~u5168~~\u3066\u540c\u3058~~\u306b\u3059\u308b~~",padding:"\u30d1\u30c7\u30a3\u30f3\u30b0","box_clear":"\u56de\u308a\u8fbc\u307f\u89e3\u9664","box_float":"\u56de\u308a\u8fbc\u307f","box_height":"\u9ad8\u3055","box_width":"\u5e45","block_display":"\u30c7\u30a3\u30b9\u30d7\u30ec\u30a4","block_whitespace":"\u7a7a\u767d\u6587\u5b57","block_text_indent":"\~~u30a4~~\~~u30f3~~\~~u30c7~~\~~u30f3~~\~~u30c8~~","block_text_align":"\u6c34\u5e73\u914d\u7f6e","block_vertical_alignment":"\u5782\u76f4\u914d\u7f6e","block_letterspacing":"\u6587\u5b57\u9593\u9694","block_wordspacing":"\u5358\u8a9e\u9593\u9694","background_vpos":"\u5782\u76f4\u4f4d\u7f6e","background_hpos":"\u6c34\u5e73\u4f4d\u7f6e","background_attachment":"~~Attachment~~","background_repeat":"\u7e70\u308a\u8fd4\u3057","background_image":"\u80cc\u666f\u753b\u50cf","background_color":"\u80cc\u666f\u8272","text_none":"\u306a\u3057","text_blink":"\u70b9\u6ec5","text_case":"\u5927\u6587\u5b57/\u5c0f\u6587\u5b57","text_striketrough":"\u6253\u6d88\u3057\u7dda","text_underline":"\u4e0b\u7dda","text_overline":"\u4e0a\u7dda","text_decoration":"\u88c5\u98fe","text_color":"\u8272",text:"\u6587\u5b57",background:"\u80cc\u666f",block:"\u30d6\u30ed\u30c3\u30af",box:"\u30dc\u30c3\u30af\u30b9",border:"\u67a0\u7dda",list:"\~~u30ea~~\~~u30b9~~\~~u30c8~~"});

+ tinyMCE.addI18n('ja.style_dlg',{"text_lineheight":"\u884c\u306e\u9ad8\u3055","text_variant":"\u5909\u5f62","text_style":"\u30b9\u30bf\u30a4\u30eb","text_weight":"\u592a\u3055","text_size":"\u5927\u304d\u3055","text_font":"\u30d5\u30a9\u30f3\u30c8","text_props":"\u30c6\u30ad\u30b9\u30c8","positioning_tab":"\u4f4d\u7f6e","list_tab":"\u7b87\u6761\u66f8\u304d","border_tab":"\u67a0\u7dda","box_tab":"\u30dc\u30c3\u30af\u30b9","block_tab":"\u30d6\u30ed\u30c3\u30af","background_tab":"\u80cc\u666f","text_tab":"\u6587\u5b57",apply:"\u9069\u7528",title:"CSS\u306e\u30b9\u30bf\u30a4\u30eb\u3092\u7de8\u96c6",clip:"\u5207\u308a\u629c\u304d",placement:"\u914d\u7f6e",overflow:"\u30aa\u30fc\u30d0\u30fc\u30d5\u30ed\u30fc",zindex:"Z-index",visibility:"\u53ef\u8996\u6027","positioning_type":"\u914d\u7f6e\u65b9\u6cd5",position:"\u8868\u793a\u4f4d\u7f6e","bullet_image":"\u884c\u982d\u6587\u5b57","list_type":"\u7b87\u6761\u66f8\u304d\u306e\u7a2e\u985e",color:"\u8272",height:"\u9ad8\u3055",width:"\u5e45",style:"\u30b9\u30bf\u30a4\u30eb",margin:"\u30de\u30fc\u30b8\u30f3",left:"\u5de6",bottom:"\u4e0b",right:"\u53f3",top:"\u4e0a",same:"\u3059\u3079\u3066\u540c\u3058",padding:"\u30d1\u30c7\u30a3\u30f3\u30b0","box_clear":"\u56de\u308a\u8fbc\u307f\u89e3\u9664","box_float":"\u56de\u308a\u8fbc\u307f","box_height":"\u9ad8\u3055","box_width":"\u5e45","block_display":"\u30c7\u30a3\u30b9\u30d7\u30ec\u30a4","block_whitespace":"\u7a7a\u767d\u6587\u5b57","block_text_indent":"\u30c6\u30ad\u30b9\u30c8\u306e\u5b57\u4e0b\u3052","block_text_align":"\u30c6\u30ad\u30b9\u30c8\u306e\u6c34\u5e73\u914d\u7f6e","block_vertical_alignment":"\u5782\u76f4\u914d\u7f6e","block_letterspacing":"\u6587\u5b57\u9593\u9694","block_wordspacing":"\u5358\u8a9e\u9593\u9694","background_vpos":"\u5782\u76f4\u4f4d\u7f6e","background_hpos":"\u6c34\u5e73\u4f4d\u7f6e","background_attachment":"\u6dfb\u4ed8","background_repeat":"\u7e70\u308a\u8fd4\u3057","background_image":"\u80cc\u666f\u753b\u50cf","background_color":"\u80cc\u666f\u8272","text_none":"\u306a\u3057","text_blink":"\u70b9\u6ec5","text_case":"\u5927\u6587\u5b57/\u5c0f\u6587\u5b57","text_striketrough":"\u6253\u6d88\u3057\u7dda","text_underline":"\u4e0b\u7dda","text_overline":"\u4e0a\u7dda","text_decoration":"\u88c5\u98fe","text_color":"\u8272",text:"\u6587\u5b57",background:"\u80cc\u666f",block:"\u30d6\u30ed\u30c3\u30af",box:"\u30dc\u30c3\u30af\u30b9",border:"\u67a0\u7dda",list:"\u7b87\u6761\u66f8\u304d"});

mce/style/langs/zh_dlg.js CHANGED Viewed

@@ -1 +1 @@

- tinyMCE.addI18n('zh.style_dlg',{"text_lineheight":"\u884c\u9ad8","text_variant":"\u7279\u6b8a\u5b57\~~u9ad4~~","text_style":"\~~u6a23~~\u5f0f","text_weight":"\u7c97\~~u9ad4~~","text_size":"\u5b57\~~u9ad4~~\u5927\u5c0f","text_font":"\u5b57\~~u9ad4~~","text_props":"\u6587\u5b57","positioning_tab":"\u4f4d\u7f6e","list_tab":"\u5217\u8868","border_tab":"\~~u908a~~\u6846","box_tab":"\u65b9\~~u584a~~","block_tab":"\~~u5340~~\~~u584a~~","background_tab":"\u80cc\u666f","text_tab":"\u6587\u5b57",apply:"\~~u5957~~\u7528",title:"\~~u7de8~~\~~u8f2f CSS~~ \~~u6a23~~\u5f0f~~\u8868~~",clip:"\u526a\~~u8f2f~~",placement:"\u653e\u7f6e",overflow:"\u6ea2\u51fa",zindex:"Z-\u5ea7\~~u6a19~~",visibility:"\u53ef\~~u898b~~","positioning_type":"\~~u985e~~\u578b",position:"\u4f4d\u7f6e","bullet_image":"\~~u5716~~\u7247\~~u9805~~\u76ee\u7b26\~~u865f~~","list_type":"\u5217\u8868\~~u985e~~\u578b",color:"\u984f\u8272",height:"\u9ad8",width:"\u5bec",style:"\u6a23\u5f0f",margin:"\u5916\u908a\u8ddd",left:"\u5de6\u5074",bottom:"\u4e0b\u5074",right:"\u53f3\u5074",top:"\u4e0a\u5074",same:"\u4e00\u81f4",padding:"\u5167\u908a\u8ddd","box_clear":"\u6e05\u9664\u6d6e\u52d5","box_float":"\u6d6e\u52d5","box_height":"\u9ad8","box_width":"\u5bec","block_display":"\u986f\u793a","block_whitespace":"\u7a7a\u683c","block_text_indent":"\u6587\u5b57\u7e2e\u6392","block_text_align":"\u6587\u5b57\u5c0d\u9f4a","block_vertical_alignment":"\u5782\u76f4\u5c0d\u9f4a","block_letterspacing":"\u5b57\u6bcd\u9593\u8ddd","block_wordspacing":"\u9593\u8ddd","background_vpos":"\u5782\u76f4\u4f4d\u7f6e","background_hpos":"\u6c34\u5e73\u4f4d\u7f6e","background_attachment":"\u9644\u4ef6","background_repeat":"\u91cd\u8986","background_image":"\u80cc\u666f\u5716\u7247","background_color":"\u80cc\u666f\u984f\u8272","text_none":"\u7121","text_blink":"\u9583\u720d","text_case":"\u5b57\u578b","text_striketrough":"\u522a\u9664\u7dda","text_underline":"\u5e95\u7dda","text_overline":"\u4e0a\u5283\u7dda","text_decoration":"\u88dd\u98fe","text_color":"\u984f\u8272",text:"\u6587\u5b57",background:"\u80cc\u666f",block:"\u5206\u6bb5",box:"\u5323\u5b50",border:"\u908a\u6846",list:"\u5217\u8868"});

+ tinyMCE.addI18n('zh.style_dlg',{"text_lineheight":"\u884c\u9ad8","text_variant":"\u7279\u6b8a\u5b57\u4f53","text_style":"\u6837\u5f0f","text_weight":"\u7c97\u4f53","text_size":"\u5b57\u4f53\u5927\u5c0f","text_font":"\u5b57\u4f53","text_props":"\u6587\u5b57","positioning_tab":"\u4f4d\u7f6e","list_tab":"\u5217\u8868","border_tab":"\u8fb9\u6846","box_tab":"\u65b9\u5757","block_tab":"\u533a\u5757","background_tab":"\u80cc\u666f","text_tab":"\u6587\u5b57",apply:"\u5e94\u7528",title:"\u7f16\u8f91CSS\u6837\u5f0f",clip:"\u526a\u8f91",placement:"\u653e\u7f6e",overflow:"\u6ea2\u51fa",zindex:"Z-\u5ea7\u6807",visibility:"\u53ef\u89c1","positioning_type":"\u7c7b\u578b",position:"\u4f4d\u7f6e","bullet_image":"\u56fe\u7247\u9879\u76ee\u7b26\u53f7","list_type":"\u5217\u8868\u7c7b\u578b",color:"\u984f\u8272",height:"\u9ad8",width:"\u5bec",style:"\u6a23\u5f0f",margin:"\u5916\u908a\u8ddd",left:"\u5de6\u5074",bottom:"\u4e0b\u5074",right:"\u53f3\u5074",top:"\u4e0a\u5074",same:"\u4e00\u81f4",padding:"\u5167\u908a\u8ddd","box_clear":"\u6e05\u9664\u6d6e\u52d5","box_float":"\u6d6e\u52d5","box_height":"\u9ad8","box_width":"\u5bec","block_display":"\u986f\u793a","block_whitespace":"\u7a7a\u683c","block_text_indent":"\u6587\u5b57\u7e2e\u6392","block_text_align":"\u6587\u5b57\u5c0d\u9f4a","block_vertical_alignment":"\u5782\u76f4\u5c0d\u9f4a","block_letterspacing":"\u5b57\u6bcd\u9593\u8ddd","block_wordspacing":"\u9593\u8ddd","background_vpos":"\u5782\u76f4\u4f4d\u7f6e","background_hpos":"\u6c34\u5e73\u4f4d\u7f6e","background_attachment":"\u9644\u4ef6","background_repeat":"\u91cd\u8986","background_image":"\u80cc\u666f\u5716\u7247","background_color":"\u80cc\u666f\u984f\u8272","text_none":"\u7121","text_blink":"\u9583\u720d","text_case":"\u5b57\u578b","text_striketrough":"\u522a\u9664\u7dda","text_underline":"\u5e95\u7dda","text_overline":"\u4e0a\u5283\u7dda","text_decoration":"\u88dd\u98fe","text_color":"\u984f\u8272",text:"\u6587\u5b57",background:"\u80cc\u666f",block:"\u5206\u6bb5",box:"\u5323\u5b50",border:"\u908a\u6846",list:"\u5217\u8868"});

mce/style/props.htm CHANGED Viewed

	@@ -2,12 +2,12 @@
2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#style_dlg.title}</title>
5	- <script type="text/javascript" src="../../tiny_mce_popup.js?ver=~~345~~"></script>
6	- <script type="text/javascript" src="../../utils/mctabs.js?ver=~~345~~"></script>
7	- <script type="text/javascript" src="../../utils/editable_selects.js?ver=~~345~~"></script>
8	- <script type="text/javascript" src="../../utils/form_utils.js?ver=~~345~~"></script>
9	- <script type="text/javascript" src="js/props.js?ver=~~345~~"></script>
10	- <link href="css/props.css?ver=~~345~~" rel="stylesheet" type="text/css" />
11	</head>
12
13	<body id="styleprops" style="display: none" role="application" aria-labelledby="app_title">
	@@ -118,7 +118,7 @@
118	<td><label for="text_blink">{#style_dlg.text_blink}</label></td>
119	</tr>
120	<tr>
121	- <td><input id="text_none" name="text_none" class="checkbox" type="checkbox" /></td>
122	<td><label for="text_none">{#style_dlg.text_none}</label></td>
123	</tr>
124	</table>


2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#style_dlg.title}</title>
5	+ <script type="text/javascript" src="../../tiny_mce_popup.js?ver=349"></script>
6	+ <script type="text/javascript" src="../../utils/mctabs.js?ver=349"></script>
7	+ <script type="text/javascript" src="../../utils/editable_selects.js?ver=349"></script>
8	+ <script type="text/javascript" src="../../utils/form_utils.js?ver=349"></script>
9	+ <script type="text/javascript" src="js/props.js?ver=349"></script>
10	+ <link href="css/props.css?ver=349" rel="stylesheet" type="text/css" />
11	</head>
12
13	<body id="styleprops" style="display: none" role="application" aria-labelledby="app_title">

118	<td><label for="text_blink">{#style_dlg.text_blink}</label></td>
119	</tr>
120	<tr>
121	+ <td><input id="text_none" name="text_none" class="checkbox" type="checkbox" onclick="updateTextDecorations();"/></td>
122	<td><label for="text_none">{#style_dlg.text_none}</label></td>
123	</tr>
124	</table>

mce/table/cell.htm CHANGED Viewed

	@@ -2,13 +2,13 @@
2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#table_dlg.cell_title}</title>
5	- <script type="text/javascript" src="../../tiny_mce_popup.js?ver=~~345~~"></script>
6	- <script type="text/javascript" src="../../utils/mctabs.js?ver=~~345~~"></script>
7	- <script type="text/javascript" src="../../utils/form_utils.js?ver=~~345~~"></script>
8	- <script type="text/javascript" src="../../utils/validate.js?ver=~~345~~"></script>
9	- <script type="text/javascript" src="../../utils/editable_selects.js?ver=~~345~~"></script>
10	- <script type="text/javascript" src="js/cell.js?ver=~~345~~"></script>
11	- <link href="css/cell.css?ver=~~345~~" rel="stylesheet" type="text/css" />
12	</head>
13	<body id="tablecell" style="display: none" role="application">
14	<form onsubmit="updateAction();return false;" action="#">


2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#table_dlg.cell_title}</title>
5	+ <script type="text/javascript" src="../../tiny_mce_popup.js?ver=349"></script>
6	+ <script type="text/javascript" src="../../utils/mctabs.js?ver=349"></script>
7	+ <script type="text/javascript" src="../../utils/form_utils.js?ver=349"></script>
8	+ <script type="text/javascript" src="../../utils/validate.js?ver=349"></script>
9	+ <script type="text/javascript" src="../../utils/editable_selects.js?ver=349"></script>
10	+ <script type="text/javascript" src="js/cell.js?ver=349"></script>
11	+ <link href="css/cell.css?ver=349" rel="stylesheet" type="text/css" />
12	</head>
13	<body id="tablecell" style="display: none" role="application">
14	<form onsubmit="updateAction();return false;" action="#">

mce/table/editor_plugin.js CHANGED Viewed

@@ -1 +1 @@

- (function(d){var e=d.each;function c(g,h){var j=h.ownerDocument,f=j.createRange(),k;f.setStartBefore(h);f.setEnd(g.endContainer,g.endOffset);k=j.createElement("body");k.appendChild(f.cloneContents());return k.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi,"-").replace(/<[^>]+>/g,"").length==0}function a(g,f){return parseInt(g.getAttribute(f)||1)}function b(H,G,K){var g,L,D,o;t();o=G.getParent(K.getStart(),"th,td");if(o){L=F(o);D=I();o=z(L.x,L.y)}function A(N,M){N=N.cloneNode(M);N.removeAttribute("id");return N}function t(){var M=0;g=[];e(["thead","tbody","tfoot"],function(N){var O=G.select("> "+N+" tr",H);e(O,function(P,Q){Q+=M;e(G.select("> td, > th",P),function(W,R){var S,T,U,V;if(g[Q]){while(g[Q][R]){R++}}U=a(W,"rowspan");V=a(W,"colspan");for(T=Q;T<Q+U;T++){if(!g[T]){g[T]=[]}for(S=R;S<R+V;S++){g[T][S]={part:N,real:T==Q&&S==R,elm:W,rowspan:U,colspan:V}}}})});M+=O.length})}function z(M,O){var N;N=g[O];if(N){return N[M]}}function s(O,M,N){if(O){N=parseInt(N);if(N===1){O.removeAttribute(M,1)}else{O.setAttribute(M,N,1)}}}function j(M){return M&&(G.hasClass(M.elm,"mceSelected")||M==o)}function k(){var M=[];e(H.rows,function(N){e(N.cells,function(O){if(G.hasClass(O,"mceSelected")||O==o.elm){M.push(N);return false}})});return M}function r(){var M=G.createRng();M.setStartAfter(H);M.setEndAfter(H);K.setRng(M);G.remove(H)}function f(M){var N;d.walk(M,function(P){var O;if(P.nodeType==3){e(G.getParents(P.parentNode,null,M).reverse(),function(Q){Q=A(Q,false);if(!N){N=O=Q}else{if(O){O.appendChild(Q)}}O=Q});if(O){O.innerHTML=d.isIE?" ":' '}return false}},"childNodes");M=A(M,false);s(M,"rowSpan",1);s(M,"colSpan",1);if(N){M.appendChild(N)}else{if(!d.isIE){M.innerHTML=' '}}return M}function q(){var M=G.createRng();e(G.select("tr",H),function(N){if(N.cells.length==0){G.remove(N)}});if(G.select("tr",H).length==0){M.setStartAfter(H);M.setEndAfter(H);K.setRng(M);G.remove(H);return}e(G.select("thead,tbody,tfoot",H),function(N){if(N.rows.length==0){G.remove(N)}});t();row=g[Math.min(g.length-1,L.y)];if(row){K.select(row[Math.min(row.length-1,L.x)].elm,true);K.collapse(true)}}function u(S,Q,U,R){var P,N,M,O,T;P=g[Q][S].elm.parentNode;for(M=1;M<=U;M++){P=G.getNext(P,"tr");if(P){for(N=S;N>=0;N--){T=g[Q+M][N].elm;if(T.parentNode==P){for(O=1;O<=R;O++){G.insertAfter(f(T),T)}break}}if(N==-1){for(O=1;O<=R;O++){P.insertBefore(f(P.cells[0]),P.cells[0])}}}}}function C(){e(g,function(M,N){e(M,function(P,O){var S,R,T,Q;if(j(P)){P=P.elm;S=a(P,"colspan");R=a(P,"rowspan");if(S>1||R>1){s(P,"rowSpan",1);s(P,"colSpan",1);for(Q=0;Q<S-1;Q++){G.insertAfter(f(P),P)}u(O,N,R-1,S)}}})})}function p(V,S,Y){var P,O,X,W,U,R,T,M,V,N,Q;if(V){pos=F(V);P=pos.x;O=pos.y;X=P+(S-1);W=O+(Y-1)}else{P=L.x;O=L.y;X=D.x;W=D.y}T=z(P,O);M=z(X,W);if(T&&M&&T.part==M.part){C();t();T=z(P,O).elm;s(T,"colSpan",(X-P)+1);s(T,"rowSpan",(W-O)+1);for(R=O;R<=W;R++){for(U=P;U<=X;U++){if(!g[R]||!g[R][U]){continue}V=g[R][U].elm;if(V!=T){N=d.grep(V.childNodes);e(N,function(Z){T.appendChild(Z)});if(N.length){N=d.grep(T.childNodes);Q=0;e(N,function(Z){if(Z.nodeName=="BR"&&G.getAttrib(Z,"data-mce-bogus")&&Q++<N.length-1){T.removeChild(Z)}})}G.remove(V)}}}q()}}function l(Q){var M,S,P,R,T,U,N,V,O;e(g,function(W,X){e(W,function(Z,Y){if(j(Z)){Z=Z.elm;T=Z.parentNode;U=A(T,false);M=X;if(Q){return false}}});if(Q){return !M}});for(R=0;R<g[0].length;R++){if(!g[M][R]){continue}S=g[M][R].elm;if(S!=P){if(!Q){O=a(S,"rowspan");if(O>1){s(S,"rowSpan",O+1);continue}}else{if(M>0&&g[M-1][R]){V=g[M-1][R].elm;O=a(V,"rowSpan");if(O>1){s(V,"rowSpan",O+1);continue}}}N=f(S);s(N,"colSpan",S.colSpan);U.appendChild(N);P=S}}if(U.hasChildNodes()){if(!Q){G.insertAfter(U,T)}else{T.parentNode.insertBefore(U,T)}}}function h(N){var O,M;e(g,function(P,Q){e(P,function(S,R){if(j(S)){O=R;if(N){return false}}});if(N){return !O}});e(g,function(S,T){var P,Q,R;if(!S[O]){return}P=S[O].elm;if(P!=M){R=a(P,"colspan");Q=a(P,"rowspan");if(R==1){if(!N){G.insertAfter(f(P),P);u(O,T,Q-1,R)}else{P.parentNode.insertBefore(f(P),P);u(O,T,Q-1,R)}}else{s(P,"colSpan",P.colSpan+1)}M=P}})}function n(){var M=[];e(g,function(N,O){e(N,function(Q,P){if(j(Q)&&d.inArray(M,P)===-1){e(g,function(T){var R=T[P].elm,S;S=a(R,"colSpan");if(S>1){s(R,"colSpan",S-1)}else{G.remove(R)}});M.push(P)}})});q()}function m(){var N;function M(Q){var P,R,O;P=G.getNext(Q,"tr");e(Q.cells,function(S){var T=a(S,"rowSpan");if(T>1){s(S,"rowSpan",T-1);R=F(S);u(R.x,R.y,1,1)}});R=F(Q.cells[0]);e(g[R.y],function(S){var T;S=S.elm;if(S!=O){T=a(S,"rowSpan");if(T<=1){G.remove(S)}else{s(S,"rowSpan",T-1)}O=S}})}N=k();e(N.reverse(),function(O){M(O)});q()}function E(){var M=k();G.remove(M);q();return M}function J(){var M=k();e(M,function(O,N){M[N]=A(O,true)});return M}function B(O,N){var P=k(),M=P[N?0:P.length-1],Q=M.cells.length;e(g,function(S){var R;Q=0;e(S,function(U,T){if(U.real){Q+=U.colspan}if(U.elm.parentNode==M){R=1}});if(R){return false}});if(!N){O.reverse()}e(O,function(T){var S=T.cells.length,R;for(i=0;i<S;i++){R=T.cells[i];s(R,"colSpan",1);s(R,"rowSpan",1)}for(i=S;i<Q;i++){T.appendChild(f(T.cells[S-1]))}for(i=Q;i<S;i++){G.remove(T.cells[i])}if(N){M.parentNode.insertBefore(T,M)}else{G.insertAfter(T,M)}})}function F(M){var N;e(g,function(O,P){e(O,function(R,Q){if(R.elm==M){N={x:Q,y:P};return false}});return !N});return N}function w(M){L=F(M)}function I(){var O,N,M;N=M=0;e(g,function(P,Q){e(P,function(S,R){var U,T;if(j(S)){S=g[Q][R];if(R>N){N=R}if(Q>M){M=Q}if(S.real){U=S.colspan-1;T=S.rowspan-1;if(U){if(R+U>N){N=R+U}}if(T){if(Q+T>M){M=Q+T}}}}})});return{x:N,y:M}}function v(S){var P,O,U,T,N,M,Q,R;D=F(S);if(L&&D){P=Math.min(L.x,D.x);O=Math.min(L.y,D.y);U=Math.max(L.x,D.x);T=Math.max(L.y,D.y);N=U;M=T;for(y=O;y<=M;y++){S=g[y][P];if(!S.real){if(P-(S.colspan-1)<P){P-=S.colspan-1}}}for(x=P;x<=N;x++){S=g[O][x];if(!S.real){if(O-(S.rowspan-1)<O){O-=S.rowspan-1}}}for(y=O;y<=T;y++){for(x=P;x<=U;x++){S=g[y][x];if(S.real){Q=S.colspan-1;R=S.rowspan-1;if(Q){if(x+Q>N){N=x+Q}}if(R){if(y+R>M){M=y+R}}}}}G.removeClass(G.select("td.mceSelected,th.mceSelected"),"mceSelected");for(y=O;y<=M;y++){for(x=P;x<=N;x++){if(g[y][x]){G.addClass(g[y][x].elm,"mceSelected")}}}}}d.extend(this,{deleteTable:r,split:C,merge:p,insertRow:l,insertCol:h,deleteCols:n,deleteRows:m,cutRows:E,copyRows:J,pasteRows:B,getPos:F,setStartCell:w,setEndCell:v})}d.create("tinymce.plugins.TablePlugin",{init:function(g,h){var f,m,j=true;function l(p){var o=g.selection,n=g.dom.getParent(p||o.getNode(),"table");if(n){return new b(n,g.dom,o)}}function k(){g.getBody().style.webkitUserSelect="";if(j){g.dom.removeClass(g.dom.select("td.mceSelected,th.mceSelected"),"mceSelected");j=false}}e([["table","table.desc","mceInsertTable",true],["delete_table","table.del","mceTableDelete"],["delete_col","table.delete_col_desc","mceTableDeleteCol"],["delete_row","table.delete_row_desc","mceTableDeleteRow"],["col_after","table.col_after_desc","mceTableInsertColAfter"],["col_before","table.col_before_desc","mceTableInsertColBefore"],["row_after","table.row_after_desc","mceTableInsertRowAfter"],["row_before","table.row_before_desc","mceTableInsertRowBefore"],["row_props","table.row_desc","mceTableRowProps",true],["cell_props","table.cell_desc","mceTableCellProps",true],["split_cells","table.split_cells_desc","mceTableSplitCells",true],["merge_cells","table.merge_cells_desc","mceTableMergeCells",true]],function(n){g.addButton(n[0],{title:n[1],cmd:n[2],ui:n[3]})});if(!d.isIE){g.onClick.add(function(n,o){o=o.target;if(o.nodeName==="TABLE"){n.selection.select(o);n.nodeChanged()}})}g.onPreProcess.add(function(o,p){var n,q,r,t=o.dom,s;n=t.select("table",p.node);q=n.length;while(q--){r=n[q];t.setAttrib(r,"data-mce-style","");if((s=t.getAttrib(r,"width"))){t.setStyle(r,"width",s);t.setAttrib(r,"width","")}if((s=t.getAttrib(r,"height"))){t.setStyle(r,"height",s);t.setAttrib(r,"height","")}}});g.onNodeChange.add(function(q,o,s){var r;s=q.selection.getStart();r=q.dom.getParent(s,"td,th,caption");o.setActive("table",s.nodeName==="TABLE"||!!r);if(r&&r.nodeName==="CAPTION"){r=0}o.setDisabled("delete_table",!r);o.setDisabled("delete_col",!r);o.setDisabled("delete_table",!r);o.setDisabled("delete_row",!r);o.setDisabled("col_after",!r);o.setDisabled("col_before",!r);o.setDisabled("row_after",!r);o.setDisabled("row_before",!r);o.setDisabled("row_props",!r);o.setDisabled("cell_props",!r);o.setDisabled("split_cells",!r);o.setDisabled("merge_cells",!r)});g.onInit.add(function(r){var p,t,q=r.dom,u;f=r.windowManager;r.onMouseDown.add(function(w,z){if(z.button!=2){k();t=q.getParent(z.target,"td,th");p=q.getParent(t,"table")}});q.bind(r.getDoc(),"mouseover",function(C){var A,z,B=C.target;if(t&&(u||B!=t)&&(B.nodeName=="TD"||B.nodeName=="TH")){z=q.getParent(B,"table");if(z==p){if(!u){u=l(z);u.setStartCell(t);r.getBody().style.webkitUserSelect="none"}u.setEndCell(B);j=true}A=r.selection.getSel();try{if(A.removeAllRanges){A.removeAllRanges()}else{A.empty()}}catch(w){}C.preventDefault()}});r.onMouseUp.add(function(F,G){var z,B=F.selection,H,I=B.getSel(),w,C,A,E;if(t){if(u){F.getBody().style.webkitUserSelect=""}function D(J,L){var K=new d.dom.TreeWalker(J,J);do{if(J.nodeType==3&&d.trim(J.nodeValue).length!=0){if(L){z.setStart(J,0)}else{z.setEnd(J,J.nodeValue.length)}return}if(J.nodeName=="BR"){if(L){z.setStartBefore(J)}else{z.setEndBefore(J)}return}}while(J=(L?K.next():K.prev()))}H=q.select("td.mceSelected,th.mceSelected");if(H.length>0){z=q.createRng();C=H[0];E=H[H.length-1];z.setStartBefore(C);z.setEndAfter(C);D(C,1);w=new d.dom.TreeWalker(C,q.getParent(H[0],"table"));do{if(C.nodeName=="TD"||C.nodeName=="TH"){if(!q.hasClass(C,"mceSelected")){break}A=C}}while(C=w.next());D(A);B.setRng(z)}F.nodeChanged();t=u=p=null}});r.onKeyUp.add(function(w,z){k()});r.onKeyDown.add(function(w,z){n(w)});r.onMouseDown.add(function(w,z){if(z.button!=2){n(w)}});function o(D,z,A,F){var B=3,G=D.dom.getParent(z.startContainer,"TABLE"),C,w,E;if(G){C=G.parentNode}w=z.startContainer.nodeType==B&&z.startOffset==0&&z.endOffset==0&&F&&(A.nodeName=="TR"||A==C);E=(A.nodeName=="TD"||A.nodeName=="TH")&&!F;return w||E}function n(A){if(!d.isWebKit){return}var z=A.selection.getRng();var C=A.selection.getNode();var B=A.dom.getParent(z.startContainer,"TD");if(!o(A,z,C,B)){return}if(!B){B=C}var w=B.lastChild;while(w.lastChild){w=w.lastChild}z.setEnd(w,w.nodeValue.length);A.selection.setRng(z)}r.plugins.table.fixTableCellSelection=n;if(r&&r.plugins.contextmenu){r.plugins.contextmenu.onContextMenu.add(function(A,w,C){var D,B=r.selection,z=B.getNode()||r.getBody();if(r.dom.getParent(C,"td")||r.dom.getParent(C,"th")||r.dom.select("td.mceSelected,th.mceSelected").length){w.removeAll();if(z.nodeName=="A"&&!r.dom.getAttrib(z,"name")){w.add({title:"advanced.link_desc",icon:"link",cmd:r.plugins.advlink?"mceAdvLink":"mceLink",ui:true});w.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"});w.addSeparator()}if(z.nodeName=="IMG"&&z.className.indexOf("mceItem")==-1){w.add({title:"advanced.image_desc",icon:"image",cmd:r.plugins.advimage?"mceAdvImage":"mceImage",ui:true});w.addSeparator()}w.add({title:"table.desc",icon:"table",cmd:"mceInsertTable",value:{action:"insert"}});w.add({title:"table.props_desc",icon:"table_props",cmd:"mceInsertTable"});w.add({title:"table.del",icon:"delete_table",cmd:"mceTableDelete"});w.addSeparator();D=w.addMenu({title:"table.cell"});D.add({title:"table.cell_desc",icon:"cell_props",cmd:"mceTableCellProps"});D.add({title:"table.split_cells_desc",icon:"split_cells",cmd:"mceTableSplitCells"});D.add({title:"table.merge_cells_desc",icon:"merge_cells",cmd:"mceTableMergeCells"});D=w.addMenu({title:"table.row"});D.add({title:"table.row_desc",icon:"row_props",cmd:"mceTableRowProps"});D.add({title:"table.row_before_desc",icon:"row_before",cmd:"mceTableInsertRowBefore"});D.add({title:"table.row_after_desc",icon:"row_after",cmd:"mceTableInsertRowAfter"});D.add({title:"table.delete_row_desc",icon:"delete_row",cmd:"mceTableDeleteRow"});D.addSeparator();D.add({title:"table.cut_row_desc",icon:"cut",cmd:"mceTableCutRow"});D.add({title:"table.copy_row_desc",icon:"copy",cmd:"mceTableCopyRow"});D.add({title:"table.paste_row_before_desc",icon:"paste",cmd:"mceTablePasteRowBefore"}).setDisabled(!m);D.add({title:"table.paste_row_after_desc",icon:"paste",cmd:"mceTablePasteRowAfter"}).setDisabled(!m);D=w.addMenu({title:"table.col"});D.add({title:"table.col_before_desc",icon:"col_before",cmd:"mceTableInsertColBefore"});D.add({title:"table.col_after_desc",icon:"col_after",cmd:"mceTableInsertColAfter"});D.add({title:"table.delete_col_desc",icon:"delete_col",cmd:"mceTableDeleteCol"})}else{w.add({title:"table.desc",icon:"table",cmd:"mceInsertTable"})}})}if(d.isWebKit){function v(B,M){function F(Q){B.selection.setCursorLocation(Q,0)}function H(R,Q){return R.keyCode==z?Q.previousSibling:Q.nextSibling}function G(R,S){var Q=H(R,S);return Q!==null&&Q.tagName==="TR"?Q:null}function C(Q,R){return Q.dom.getParent(R,"table")}function O(Q){var R=C(B,Q);return H(M,R)}function A(Q){return Q.keyCode==z||Q.keyCode==I}function D(Q){var S=Q.selection.getNode();var R=Q.dom.getParent(S,"tr");return R!==null}function N(R){var Q=0;var S=R;while(S.previousSibling){S=S.previousSibling;Q=Q+a(S,"colspan")}return Q}function E(S,Q){var T=0;var R=0;e(S.children,function(U,V){T=T+a(U,"colspan");R=V;if(T>Q){return false}});return R}function w(S,T,V){var U=N(S.dom.getParent(T,"td,th"));var R=E(V,U);var Q=V.childNodes[R];F(Q)}function L(R,T){var Q=O(R);if(Q!==null){F(Q);return d.dom.Event.cancel(T)}else{var S=T.keyCode==z?R.firstChild:R.lastChild;F(S);return true}}var z=38;var I=40;if(A(M)&&D(B)){var J=B.selection.getNode();var P=B.dom.getParent(J,"tr");var K=G(M,P);if(K==null){return L(P,M)}else{w(B,J,K);d.dom.Event.cancel(M);return true}}}r.onKeyDown.add(v)}if(!d.isIE){function s(){var w;for(w=r.getBody().lastChild;w&&w.nodeType==3&&!w.nodeValue.length;w=w.previousSibling){}if(w&&w.nodeName=="TABLE"){r.dom.add(r.getBody(),"p",null,' ')}}if(d.isGecko){r.onKeyDown.add(function(z,B){var w,A,C=z.dom;if(B.keyCode==37||B.keyCode==38){w=z.selection.getRng();A=C.getParent(w.startContainer,"table");if(A&&z.getBody().firstChild==A){if(c(w,A)){w=C.createRng();w.setStartBefore(A);w.setEndBefore(A);z.selection.setRng(w);B.preventDefault()}}}})}r.onKeyUp.add(s);r.onSetContent.add(s);r.onVisualAid.add(s);r.onPreProcess.add(function(w,A){var z=A.node.lastChild;if(z&&z.childNodes.length==1&&z.firstChild.nodeName=="BR"){w.dom.remove(z)}});s();r.startContent=r.getContent({format:"raw"})}});e({mceTableSplitCells:function(n){n.split()},mceTableMergeCells:function(o){var p,q,n;n=g.dom.getParent(g.selection.getNode(),"th,td");if(n){p=n.rowSpan;q=n.colSpan}if(!g.dom.select("td.mceSelected,th.mceSelected").length){f.open({url:h+"/merge_cells.htm",width:240+parseInt(g.getLang("table.merge_cells_delta_width",0)),height:110+parseInt(g.getLang("table.merge_cells_delta_height",0)),inline:1},{rows:p,cols:q,onaction:function(r){o.merge(n,r.cols,r.rows)},plugin_url:h})}else{o.merge()}},mceTableInsertRowBefore:function(n){n.insertRow(true)},mceTableInsertRowAfter:function(n){n.insertRow()},mceTableInsertColBefore:function(n){n.insertCol(true)},mceTableInsertColAfter:function(n){n.insertCol()},mceTableDeleteCol:function(n){n.deleteCols()},mceTableDeleteRow:function(n){n.deleteRows()},mceTableCutRow:function(n){m=n.cutRows()},mceTableCopyRow:function(n){m=n.copyRows()},mceTablePasteRowBefore:function(n){n.pasteRows(m,true)},mceTablePasteRowAfter:function(n){n.pasteRows(m)},mceTableDelete:function(n){n.deleteTable()}},function(o,n){g.addCommand(n,function(){var p=l();if(p){o(p);g.execCommand("mceRepaint");k()}})});e({mceInsertTable:function(n){f.open({url:h+"/table.htm",width:400+parseInt(g.getLang("table.table_delta_width",0)),height:320+parseInt(g.getLang("table.table_delta_height",0)),inline:1},{plugin_url:h,action:n?n.action:0})},mceTableRowProps:function(){f.open({url:h+"/row.htm",width:400+parseInt(g.getLang("table.rowprops_delta_width",0)),height:295+parseInt(g.getLang("table.rowprops_delta_height",0)),inline:1},{plugin_url:h})},mceTableCellProps:function(){f.open({url:h+"/cell.htm",width:400+parseInt(g.getLang("table.cellprops_delta_width",0)),height:295+parseInt(g.getLang("table.cellprops_delta_height",0)),inline:1},{plugin_url:h})}},function(o,n){g.addCommand(n,function(p,q){o(q)})})}});d.PluginManager.add("table",d.plugins.TablePlugin)})(tinymce);

mce/table/js/table.js CHANGED Viewed

	@@ -60,7 +60,19 @@ function insertTable() {
60	if (action == "update") {
61	dom.setAttrib(elm, 'cellPadding', cellpadding, true);
62	dom.setAttrib(elm, 'cellSpacing', cellspacing, true);
63	- ~~dom.setAttrib(elm, 'border', border);~~












64	dom.setAttrib(elm, 'align', align);
65	dom.setAttrib(elm, 'frame', frame);
66	dom.setAttrib(elm, 'rules', rules);
	@@ -119,7 +131,7 @@ function insertTable() {
119	if (bordercolor != "") {
120	elm.style.borderColor = bordercolor;
121	elm.style.borderStyle = elm.style.borderStyle == "" ? "solid" : elm.style.borderStyle;
122	- elm.style.borderWidth = border ~~== "" ? "1px" : border~~;
123	} else
124	elm.style.borderColor = '';
125
	@@ -132,7 +144,7 @@ function insertTable() {
132	//elm.outerHTML = elm.outerHTML;
133
134	inst.nodeChanged();
135	- inst.execCommand('mceEndUndoLevel');
136
137	// Repaint if dimensions changed
138	if (formObj.width.value != orgTableWidth \|\| formObj.height.value != orgTableHeight)
	@@ -146,7 +158,10 @@ function insertTable() {
146	html += '<table';
147
148	html += makeAttrib('id', id);
149	- ~~html~~ ~~+= makeAttrib~~('border', ~~border);~~



150	html += makeAttrib('cellpadding', cellpadding);
151	html += makeAttrib('cellspacing', cellspacing);
152	html += makeAttrib('data-mce-new', '1');
	@@ -228,12 +243,15 @@ function insertTable() {
228	inst.execCommand('mceInsertContent', false, html);
229
230	tinymce.each(dom.select('table[data-mce-new]'), function(node) {
231	- ~~var~~ td = ~~dom.select('td',~~ ~~node);~~



232

233	try {
234	- // IE9 might fail to do this selection
235	- inst.selection.~~select~~(td[0], ~~true~~);
236	- inst.selection.collapse();
237	} catch (ex) {
238	// Ignore
239	}
	@@ -242,7 +260,7 @@ function insertTable() {
242	});
243
244	inst.addVisual();
245	- inst.execCommand('mceEndUndoLevel');
246
247	tinyMCEPopup.close();
248	}
	@@ -384,6 +402,20 @@ function changedSize() {
384	formObj.style.value = dom.serializeStyle(st);
385	}
386














387	function changedBackgroundImage() {
388	var formObj = document.forms[0];
389	var st = dom.parseStyle(formObj.style.value);
	@@ -398,8 +430,14 @@ function changedBorder() {
398	var st = dom.parseStyle(formObj.style.value);
399
400	// Update border width if the element has a color
401	- if (formObj.border.value != "" && formObj.bordercolor.value != "")
402	- st['border-width'] = formObj.border.value ~~+ "px"~~;






403
404	formObj.style.value = dom.serializeStyle(st);
405	}
	@@ -415,7 +453,7 @@ function changedColor() {
415
416	// Add border-width if it's missing
417	if (!st['border-width'])
418	- st['border-width'] = formObj.border.value ~~== "" ? "1px" : formObj.border.value + "px"~~;
419	}
420
421	formObj.style.value = dom.serializeStyle(st);


60	if (action == "update") {
61	dom.setAttrib(elm, 'cellPadding', cellpadding, true);
62	dom.setAttrib(elm, 'cellSpacing', cellspacing, true);
63	+
64	+ if (!isCssSize(border)) {
65	+ dom.setAttrib(elm, 'border', border);
66	+ } else {
67	+ dom.setAttrib(elm, 'border', '');
68	+ }
69	+
70	+ if (border == '') {
71	+ dom.setStyle(elm, 'border-width', '');
72	+ dom.setStyle(elm, 'border', '');
73	+ dom.setAttrib(elm, 'border', '');
74	+ }
75	+
76	dom.setAttrib(elm, 'align', align);
77	dom.setAttrib(elm, 'frame', frame);
78	dom.setAttrib(elm, 'rules', rules);

131	if (bordercolor != "") {
132	elm.style.borderColor = bordercolor;
133	elm.style.borderStyle = elm.style.borderStyle == "" ? "solid" : elm.style.borderStyle;
134	+ elm.style.borderWidth = cssSize(border);
135	} else
136	elm.style.borderColor = '';
137

144	//elm.outerHTML = elm.outerHTML;
145
146	inst.nodeChanged();
147	+ inst.execCommand('mceEndUndoLevel', false, {}, {skip_undo: true});
148
149	// Repaint if dimensions changed
150	if (formObj.width.value != orgTableWidth \|\| formObj.height.value != orgTableHeight)

158	html += '<table';
159
160	html += makeAttrib('id', id);
161	+ if (!isCssSize(border)) {
162	+ html += makeAttrib('border', border);
163	+ }
164	+
165	html += makeAttrib('cellpadding', cellpadding);
166	html += makeAttrib('cellspacing', cellspacing);
167	html += makeAttrib('data-mce-new', '1');

243	inst.execCommand('mceInsertContent', false, html);
244
245	tinymce.each(dom.select('table[data-mce-new]'), function(node) {
246	+ // Fixes a bug in IE where the caret cannot be placed after the table if the table is at the end of the document
247	+ if (tinymce.isIE && node.nextSibling == null) {
248	+ dom.insertAfter(dom.create('p'), node);
249	+ }
250
251	+ var tdorth = dom.select('td,th', node);
252	try {
253	+ // IE9 might fail to do this selection
254	+ inst.selection.setCursorLocation(tdorth[0], 0);

255	} catch (ex) {
256	// Ignore
257	}

260	});
261
262	inst.addVisual();
263	+ inst.execCommand('mceEndUndoLevel', false, {}, {skip_undo: true});
264
265	tinyMCEPopup.close();
266	}

402	formObj.style.value = dom.serializeStyle(st);
403	}
404
405	+ function isCssSize(value) {
406	+ return /^[0-9.]+(%\|in\|cm\|mm\|em\|ex\|pt\|pc\|px)$/.test(value);
407	+ }
408	+
409	+ function cssSize(value, def) {
410	+ value = tinymce.trim(value \|\| def);
411	+
412	+ if (!isCssSize(value)) {
413	+ return parseInt(value, 10) + 'px';
414	+ }
415	+
416	+ return value;
417	+ }
418	+
419	function changedBackgroundImage() {
420	var formObj = document.forms[0];
421	var st = dom.parseStyle(formObj.style.value);

430	var st = dom.parseStyle(formObj.style.value);
431
432	// Update border width if the element has a color
433	+ if (formObj.border.value != "" && (isCssSize(formObj.border.value) \|\| formObj.bordercolor.value != ""))
434	+ st['border-width'] = cssSize(formObj.border.value);
435	+ else {
436	+ if (!formObj.border.value) {
437	+ st['border'] = '';
438	+ st['border-width'] = '';
439	+ }
440	+ }
441
442	formObj.style.value = dom.serializeStyle(st);
443	}

453
454	// Add border-width if it's missing
455	if (!st['border-width'])
456	+ st['border-width'] = cssSize(formObj.border.value, 1);
457	}
458
459	formObj.style.value = dom.serializeStyle(st);

mce/table/langs/ja_dlg.js CHANGED Viewed

@@ -1 +1 @@

- tinyMCE.addI18n('ja.table_dlg',{"rules_border":"\u4e0a\u4e0b\u5de6\u53f3~~(border~~)","rules_box":"\u4e0a\u4e0b\u5de6\u53f3~~(box~~)","rules_vsides":"\u5de6\u53f3","rules_rhs":"\u53f3","rules_lhs":"\u5de6","rules_hsides":"\u4e0a\u4e0b","rules_below":"\u4e0b","rules_above":"\u4e0a","rules_void":"\u306a\u3057",rules:"\u8868\u306e\u5916\u67a0","frame_all":"\~~u5168~~\u3066","frame_cols":"\u5217","frame_rows":"\u884c","frame_groups":"\u30b0\u30eb\u30fc\u30d7\u6bce","frame_none":"\u306a\u3057",frame:"\u30bb\u30eb\u67a0~~\u7dda~~",caption:"\u8868\~~u306b~~\u898b\u51fa\u3057~~\u3092\u4ed8\u3051\u308b~~","missing_scope":"\u8868\u306e\~~u30b9~~\~~u30b3~~\u30fc\~~u30d7~~\~~u5c5e~~\~~u6027~~\u3092\u8a2d\u5b9a\u3057\~~u3066~~\u3044\u307e\~~u305b~~\~~u3093~~\u304c\~~u3088~~\~~u308d~~\~~u3057~~\~~u3044~~\~~u3067~~\u3059\u304b\~~uff1f~~","cell_limit":"\u30bb\u30eb\u306e\u6700\u5927\u6570\u3092\u8d85\u3048\u307e\u3057\u305f\u3002","row_limit":"\u884c\u306e\u6700\u5927\u6570\u3092\u8d85\u3048\u307e\u3057\u305f\u3002","col_limit":"\u5217\u306e\u6700\u5927\u6570\u3092\u8d85\u3048\u307e\u3057\u305f\u3002",colgroup:"\u5217\u30b0\u30eb\u30fc\u30d7",rowgroup:"\u884c\u30b0\u30eb\u30fc\u30d7",scope:"\u30b9\u30b3\u30fc\u30d7",tfoot:"\u8868\u30d5\u30c3\u30bf",tbody:"\u8868\u30dc\u30c7\u30a3",thead:"\u8868\u30d8\u30c3\u30c0","row_all":"\~~u5168~~\u3066\u306e\u884c\~~u306e~~\u66f4\u65b0","row_even":"\u5076\u6570\u884c\~~u306e~~\u66f4\u65b0","row_odd":"\u5947\u6570\u884c\~~u306e~~\u66f4\u65b0","row_row":"\u9078\u629e\u884c\~~u306e~~\u66f4\u65b0","cell_all":"\~~u5168~~\u3066\u306e\u30bb\u30eb\~~u306e~~\u66f4\u65b0","cell_row":"\u884c\u5185\u306e\u30bb\u30eb\~~u306e~~\u66f4\u65b0","cell_cell":"\u9078\u629e\u30bb\u30eb\~~u306e~~\u66f4\u65b0",th:"\u30d8\u30c3\u30c0",td:"\u30c7\u30fc\u30bf",summary:"\u30b5\u30de\u30ea\u30fc",bgimage:"\u80cc\u666f\u753b\u50cf",rtl:"\u53f3\u304b\u3089\u5de6",ltr:"\u5de6\u304b\u3089\u53f3",mime:"\u30bf\u30fc\u30b2\u30c3\u30c8\u306eMIME\u30bf\u30a4\u30d7",langcode:"\u8a00\u8a9e\u30b3\u30fc\u30c9",langdir:"\u6587\u7ae0\u306e\u65b9\u5411",style:"\u30b9\u30bf\u30a4\u30eb",id:"ID","merge_cells_title":"\u30bb\u30eb\~~u306e~~\u7d50\u5408",bgcolor:"\u80cc\u666f\u8272",bordercolor:"\u67a0\u7dda\u306e\u8272","align_bottom":"\u4e0b\u63c3\u3048","align_top":"\u4e0a\u63c3\u3048",valign:"\u5782\u76f4\u65b9\u5411\u306e\u914d\u7f6e","cell_type":"\u30bb\u30eb\u7a2e\~~u5225~~","cell_title":"\u30bb\u30eb\u306e\~~u30d7~~\~~u30ed\u30d1\u30c6\u30a3~~","row_title":"\u884c\u306e\~~u30d7~~\~~u30ed\u30d1\u30c6\u30a3~~","align_middle":"\u4e2d\u592e\u63c3\u3048","align_right":"\u53f3\u63c3\u3048","align_left":"\u5de6\u63c3\u3048","align_default":"\~~u30c7~~\~~u30d5~~\~~u30a9~~\~~u30eb\u30c8~~",align:"\u914d\u7f6e",border:"\u67a0\u7dda",cellpadding:"~~Cellpadding~~",cellspacing:"~~Cellspacing~~",rows:"\u884c",cols:"\u5217",height:"\u9ad8\u3055",width:"\u5e45",title:"\u8868\u306e\u633f\u5165/\u7de8\u96c6",rowtype:"\u884c","advanced_props":"\~~u4e0a~~\~~u7d1a~~\~~u8005~~\~~u5411~~\~~u3051~~","general_props":"\u4e00\u822c","advanced_tab":"\~~u4e0a~~\~~u7d1a\u8005\u5411\u3051~~","general_tab":"\u4e00\u822c","cell_col":"\~~u5168~~\u3066\u306e\u30bb\u30eb\u3092\u66f4\u65b0"});

+ tinyMCE.addI18n('ja.table_dlg',{"rules_border":"\u67a0\u7dda(\u4e0a\u4e0b\u5de6\u53f3)","rules_box":"\u30dc\u30c3\u30af\u30b9(\u4e0a\u4e0b\u5de6\u53f3)","rules_vsides":"\u5de6\u53f3\u306e\u7e26\u7dda","rules_rhs":"\u53f3\u306e\u7e26\u7dda","rules_lhs":"\u5de6\u306e\u7e26\u7dda","rules_hsides":"\u4e0a\u4e0b\u306e\u6a2a\u7dda","rules_below":"\u4e0b\u306e\u6a2a\u7dda","rules_above":"\u4e0a\u306e\u6a2a\u7dda","rules_void":"\u306a\u3057",rules:"\u8868\u306e\u5916\u67a0","frame_all":"\u3059\u3079\u3066","frame_cols":"\u5217","frame_rows":"\u884c","frame_groups":"\u30b0\u30eb\u30fc\u30d7\u6bce","frame_none":"\u306a\u3057",frame:"\u30bb\u30eb\u306e\u67a0",caption:"\u8868\u306e\u898b\u51fa\u3057","missing_scope":"\u3053\u306e\u8868\u306e\u30d8\u30c3\u30c0\u30fc\u306e\u30bb\u30eb\u306e\u7bc4\u56f2\u3092\u8a2d\u5b9a\u3057\u306a\u3044\u3067\u672c\u5f53\u306b\u7d9a\u3051\u307e\u3059\u304b? \u3053\u306e\u307e\u307e\u3067\u306f\u76ee\u306e\u4e0d\u81ea\u7531\u306a\u65b9\u304c\u8868\u306e\u5185\u5bb9\u3084\u8868\u793a\u3055\u308c\u308b\u30c7\u30fc\u30bf\u3092\u7406\u89e3\u3059\u308b\u306e\u304c\u56f0\u96e3\u306b\u306a\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002","cell_limit":"\u30bb\u30eb\u306e\u6700\u5927\u6570\u306e${cells}\u3092\u8d85\u3048\u307e\u3057\u305f\u3002","row_limit":"\u884c\u306e\u6700\u5927\u6570\u306e${rows}\u3092\u8d85\u3048\u307e\u3057\u305f\u3002","col_limit":"\u5217\u306e\u6700\u5927\u6570\u306e${cols}\u3092\u8d85\u3048\u307e\u3057\u305f\u3002",colgroup:"\u5217\u30b0\u30eb\u30fc\u30d7",rowgroup:"\u884c\u30b0\u30eb\u30fc\u30d7",scope:"\u30b9\u30b3\u30fc\u30d7",tfoot:"\u8868\u306e\u30d5\u30c3\u30bf\u30fc",tbody:"\u8868\u306e\u30dc\u30c7\u30a3",thead:"\u8868\u306e\u30d8\u30c3\u30c0\u30fc","row_all":"\u3059\u3079\u3066\u306e\u884c\u3092\u66f4\u65b0","row_even":"\u5076\u6570\u884c\u3092\u66f4\u65b0","row_odd":"\u5947\u6570\u884c\u3092\u66f4\u65b0","row_row":"\u9078\u629e\u3057\u3066\u3044\u308b\u884c\u3092\u66f4\u65b0","cell_all":"\u3059\u3079\u3066\u306e\u30bb\u30eb\u3092\u66f4\u65b0","cell_row":"\u884c\u5185\u306e\u30bb\u30eb\u3092\u66f4\u65b0","cell_cell":"\u9078\u629e\u3057\u3066\u3044\u308b\u30bb\u30eb\u3092\u66f4\u65b0",th:"\u30d8\u30c3\u30c0\u30fc",td:"\u30c7\u30fc\u30bf",summary:"\u30b5\u30de\u30ea\u30fc",bgimage:"\u80cc\u666f\u306e\u753b\u50cf",rtl:"\u53f3\u304b\u3089\u5de6",ltr:"\u5de6\u304b\u3089\u53f3",mime:"\u30bf\u30fc\u30b2\u30c3\u30c8\u306eMIME\u30bf\u30a4\u30d7",langcode:"\u8a00\u8a9e\u30b3\u30fc\u30c9",langdir:"\u6587\u7ae0\u306e\u65b9\u5411",style:"\u30b9\u30bf\u30a4\u30eb",id:"ID","merge_cells_title":"\u30bb\u30eb\u3092\u7d50\u5408",bgcolor:"\u80cc\u666f\u306e\u8272",bordercolor:"\u67a0\u7dda\u306e\u8272","align_bottom":"\u4e0b\u63c3\u3048","align_top":"\u4e0a\u63c3\u3048",valign:"\u5782\u76f4\u65b9\u5411\u306e\u914d\u7f6e","cell_type":"\u30bb\u30eb\u306e\u7a2e\u985e","cell_title":"\u30bb\u30eb\u306e\u5c5e\u6027","row_title":"\u884c\u306e\u5c5e\u6027","align_middle":"\u4e2d\u592e\u63c3\u3048","align_right":"\u53f3\u63c3\u3048","align_left":"\u5de6\u63c3\u3048","align_default":"\u521d\u671f\u72b6\u614b",align:"\u914d\u7f6e",border:"\u67a0\u7dda",cellpadding:"\u30bb\u30eb\u306e\u30d1\u30c7\u30a3\u30f3\u30b0(cellpadding)",cellspacing:"\u30bb\u30eb\u306e\u9593\u9694(cellspacing)",rows:"\u884c",cols:"\u5217",height:"\u9ad8\u3055",width:"\u5e45",title:"\u8868\u306e\u633f\u5165\u3084\u7de8\u96c6",rowtype:"\u884c","advanced_props":"\u9ad8\u5ea6\u306a\u5c5e\u6027","general_props":"\u4e00\u822c\u7684\u306a\u5c5e\u6027","advanced_tab":"\u9ad8\u5ea6","general_tab":"\u4e00\u822c","cell_col":"\u3059\u3079\u3066\u306e\u30bb\u30eb\u3092\u66f4\u65b0"});

mce/table/merge_cells.htm CHANGED Viewed

	@@ -2,10 +2,10 @@
2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#table_dlg.merge_cells_title}</title>
5	- <script type="text/javascript" src="../../tiny_mce_popup.js?ver=~~345~~"></script>
6	- <script type="text/javascript" src="../../utils/mctabs.js?ver=~~345~~"></script>
7	- <script type="text/javascript" src="../../utils/validate.js?ver=~~345~~"></script>
8	- <script type="text/javascript" src="js/merge_cells.js?ver=~~345~~"></script>
9	</head>
10	<body style="margin: 8px" role="application">
11	<form onsubmit="MergeCellsDialog.merge();return false;" action="#">


2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#table_dlg.merge_cells_title}</title>
5	+ <script type="text/javascript" src="../../tiny_mce_popup.js?ver=349"></script>
6	+ <script type="text/javascript" src="../../utils/mctabs.js?ver=349"></script>
7	+ <script type="text/javascript" src="../../utils/validate.js?ver=349"></script>
8	+ <script type="text/javascript" src="js/merge_cells.js?ver=349"></script>
9	</head>
10	<body style="margin: 8px" role="application">
11	<form onsubmit="MergeCellsDialog.merge();return false;" action="#">

mce/table/row.htm CHANGED Viewed

	@@ -2,13 +2,13 @@
2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#table_dlg.row_title}</title>
5	- <script type="text/javascript" src="../../tiny_mce_popup.js?ver=~~345~~"></script>
6	- <script type="text/javascript" src="../../utils/mctabs.js?ver=~~345~~"></script>
7	- <script type="text/javascript" src="../../utils/form_utils.js?ver=~~345~~"></script>
8	- <script type="text/javascript" src="../../utils/validate.js?ver=~~345~~"></script>
9	- <script type="text/javascript" src="../../utils/editable_selects.js?ver=~~345~~"></script>
10	- <script type="text/javascript" src="js/row.js?ver=~~345~~"></script>
11	- <link href="css/row.css?ver=~~345~~" rel="stylesheet" type="text/css" />
12	</head>
13	<body id="tablerow" style="display: none" role="application">
14	<form onsubmit="updateAction();return false;" action="#">


2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#table_dlg.row_title}</title>
5	+ <script type="text/javascript" src="../../tiny_mce_popup.js?ver=349"></script>
6	+ <script type="text/javascript" src="../../utils/mctabs.js?ver=349"></script>
7	+ <script type="text/javascript" src="../../utils/form_utils.js?ver=349"></script>
8	+ <script type="text/javascript" src="../../utils/validate.js?ver=349"></script>
9	+ <script type="text/javascript" src="../../utils/editable_selects.js?ver=349"></script>
10	+ <script type="text/javascript" src="js/row.js?ver=349"></script>
11	+ <link href="css/row.css?ver=349" rel="stylesheet" type="text/css" />
12	</head>
13	<body id="tablerow" style="display: none" role="application">
14	<form onsubmit="updateAction();return false;" action="#">

mce/table/table.htm CHANGED Viewed

	@@ -2,13 +2,13 @@
2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#table_dlg.title}</title>
5	- <script type="text/javascript" src="../../tiny_mce_popup.js?ver=~~345~~"></script>
6	- <script type="text/javascript" src="../../utils/mctabs.js?ver=~~345~~"></script>
7	- <script type="text/javascript" src="../../utils/form_utils.js?ver=~~345~~"></script>
8	- <script type="text/javascript" src="../../utils/validate.js?ver=~~345~~"></script>
9	- <script type="text/javascript" src="../../utils/editable_selects.js?ver=~~345~~"></script>
10	- <script type="text/javascript" src="js/table.js?ver=~~345~~"></script>
11	- <link href="css/table.css?ver=~~345~~" rel="stylesheet" type="text/css" />
12	</head>
13	<body id="table" style="display: none" role="application" aria-labelledby="app_title">
14	<span style="display:none;" id="app_title">{#table_dlg.title}</span>
	@@ -46,7 +46,7 @@
46	<option value="right">{#table_dlg.align_right}</option>
47	</select></td>
48	<td><label id="borderlabel" for="border">{#table_dlg.border}</label></td>
49	- <td><input id="border" name="border" type="text" value="" size="3" maxlength="3" onchange="changedBorder();" class="~~number~~" /></td>
50	</tr>
51	<tr id="width_row">
52	<td><label id="widthlabel" for="width">{#table_dlg.width}</label></td>


2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#table_dlg.title}</title>
5	+ <script type="text/javascript" src="../../tiny_mce_popup.js?ver=349"></script>
6	+ <script type="text/javascript" src="../../utils/mctabs.js?ver=349"></script>
7	+ <script type="text/javascript" src="../../utils/form_utils.js?ver=349"></script>
8	+ <script type="text/javascript" src="../../utils/validate.js?ver=349"></script>
9	+ <script type="text/javascript" src="../../utils/editable_selects.js?ver=349"></script>
10	+ <script type="text/javascript" src="js/table.js?ver=349"></script>
11	+ <link href="css/table.css?ver=349" rel="stylesheet" type="text/css" />
12	</head>
13	<body id="table" style="display: none" role="application" aria-labelledby="app_title">
14	<span style="display:none;" id="app_title">{#table_dlg.title}</span>

46	<option value="right">{#table_dlg.align_right}</option>
47	</select></td>
48	<td><label id="borderlabel" for="border">{#table_dlg.border}</label></td>
49	+ <td><input id="border" name="border" type="text" value="" size="3" maxlength="5" onchange="changedBorder();" class="size" /></td>
50	</tr>
51	<tr id="width_row">
52	<td><label id="widthlabel" for="width">{#table_dlg.width}</label></td>

mce/xhtmlxtras/abbr.htm CHANGED Viewed

	@@ -2,13 +2,13 @@
2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#xhtmlxtras_dlg.title_abbr_element}</title>
5	- <script type="text/javascript" src="../../tiny_mce_popup.js?ver=~~345~~"></script>
6	- <script type="text/javascript" src="../../utils/mctabs.js?ver=~~345~~"></script>
7	- <script type="text/javascript" src="../../utils/form_utils.js?ver=~~345~~"></script>
8	- <script type="text/javascript" src="../../utils/editable_selects.js?ver=~~345~~"></script>
9	- <script type="text/javascript" src="js/element_common.js?ver=~~345~~"></script>
10	- <script type="text/javascript" src="js/abbr.js?ver=~~345~~"></script>
11	- <link rel="stylesheet" type="text/css" href="css/popup.css?ver=~~345~~" />
12	</head>
13	<body style="display: none" role="application" aria-labelledby="app_title">
14	<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_abbr_element}</span>


2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#xhtmlxtras_dlg.title_abbr_element}</title>
5	+ <script type="text/javascript" src="../../tiny_mce_popup.js?ver=349"></script>
6	+ <script type="text/javascript" src="../../utils/mctabs.js?ver=349"></script>
7	+ <script type="text/javascript" src="../../utils/form_utils.js?ver=349"></script>
8	+ <script type="text/javascript" src="../../utils/editable_selects.js?ver=349"></script>
9	+ <script type="text/javascript" src="js/element_common.js?ver=349"></script>
10	+ <script type="text/javascript" src="js/abbr.js?ver=349"></script>
11	+ <link rel="stylesheet" type="text/css" href="css/popup.css?ver=349" />
12	</head>
13	<body style="display: none" role="application" aria-labelledby="app_title">
14	<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_abbr_element}</span>

mce/xhtmlxtras/acronym.htm CHANGED Viewed

	@@ -2,13 +2,13 @@
2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#xhtmlxtras_dlg.title_acronym_element}</title>
5	- <script type="text/javascript" src="../../tiny_mce_popup.js?ver=~~345~~"></script>
6	- <script type="text/javascript" src="../../utils/mctabs.js?ver=~~345~~"></script>
7	- <script type="text/javascript" src="../../utils/form_utils.js?ver=~~345~~"></script>
8	- <script type="text/javascript" src="../../utils/editable_selects.js?ver=~~345~~"></script>
9	- <script type="text/javascript" src="js/element_common.js?ver=~~345~~"></script>
10	- <script type="text/javascript" src="js/acronym.js?ver=~~345~~"></script>
11	- <link rel="stylesheet" type="text/css" href="css/popup.css?ver=~~345~~" />
12	</head>
13	<body style="display: none" role="application" aria-labelledby="app_title">
14	<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_acronym_element}</span>


2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#xhtmlxtras_dlg.title_acronym_element}</title>
5	+ <script type="text/javascript" src="../../tiny_mce_popup.js?ver=349"></script>
6	+ <script type="text/javascript" src="../../utils/mctabs.js?ver=349"></script>
7	+ <script type="text/javascript" src="../../utils/form_utils.js?ver=349"></script>
8	+ <script type="text/javascript" src="../../utils/editable_selects.js?ver=349"></script>
9	+ <script type="text/javascript" src="js/element_common.js?ver=349"></script>
10	+ <script type="text/javascript" src="js/acronym.js?ver=349"></script>
11	+ <link rel="stylesheet" type="text/css" href="css/popup.css?ver=349" />
12	</head>
13	<body style="display: none" role="application" aria-labelledby="app_title">
14	<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_acronym_element}</span>

mce/xhtmlxtras/attributes.htm CHANGED Viewed

	@@ -2,12 +2,12 @@
2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#xhtmlxtras_dlg.attribs_title}</title>
5	- <script type="text/javascript" src="../../tiny_mce_popup.js?ver=~~345~~"></script>
6	- <script type="text/javascript" src="../../utils/mctabs.js?ver=~~345~~"></script>
7	- <script type="text/javascript" src="../../utils/editable_selects.js?ver=~~345~~"></script>
8	- <script type="text/javascript" src="../../utils/form_utils.js?ver=~~345~~"></script>
9	- <script type="text/javascript" src="js/attributes.js?ver=~~345~~"></script>
10	- <link rel="stylesheet" type="text/css" href="css/attributes.css?ver=~~345~~" />
11	</head>
12	<body style="display: none" role="application" aria-labelledby="app_title">
13	<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.attribs_title}</span>


2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#xhtmlxtras_dlg.attribs_title}</title>
5	+ <script type="text/javascript" src="../../tiny_mce_popup.js?ver=349"></script>
6	+ <script type="text/javascript" src="../../utils/mctabs.js?ver=349"></script>
7	+ <script type="text/javascript" src="../../utils/editable_selects.js?ver=349"></script>
8	+ <script type="text/javascript" src="../../utils/form_utils.js?ver=349"></script>
9	+ <script type="text/javascript" src="js/attributes.js?ver=349"></script>
10	+ <link rel="stylesheet" type="text/css" href="css/attributes.css?ver=349" />
11	</head>
12	<body style="display: none" role="application" aria-labelledby="app_title">
13	<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.attribs_title}</span>

mce/xhtmlxtras/cite.htm CHANGED Viewed

	@@ -2,13 +2,13 @@
2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#xhtmlxtras_dlg.title_cite_element}</title>
5	- <script type="text/javascript" src="../../tiny_mce_popup.js?ver=~~345~~"></script>
6	- <script type="text/javascript" src="../../utils/mctabs.js?ver=~~345~~"></script>
7	- <script type="text/javascript" src="../../utils/form_utils.js?ver=~~345~~"></script>
8	- <script type="text/javascript" src="../../utils/editable_selects.js?ver=~~345~~"></script>
9	- <script type="text/javascript" src="js/element_common.js?ver=~~345~~"></script>
10	- <script type="text/javascript" src="js/cite.js?ver=~~345~~"></script>
11	- <link rel="stylesheet" type="text/css" href="css/popup.css?ver=~~345~~" />
12	</head>
13	<body style="display: none" role="application" aria-labelledby="app_title">
14	<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_cite_element}</span>


2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#xhtmlxtras_dlg.title_cite_element}</title>
5	+ <script type="text/javascript" src="../../tiny_mce_popup.js?ver=349"></script>
6	+ <script type="text/javascript" src="../../utils/mctabs.js?ver=349"></script>
7	+ <script type="text/javascript" src="../../utils/form_utils.js?ver=349"></script>
8	+ <script type="text/javascript" src="../../utils/editable_selects.js?ver=349"></script>
9	+ <script type="text/javascript" src="js/element_common.js?ver=349"></script>
10	+ <script type="text/javascript" src="js/cite.js?ver=349"></script>
11	+ <link rel="stylesheet" type="text/css" href="css/popup.css?ver=349" />
12	</head>
13	<body style="display: none" role="application" aria-labelledby="app_title">
14	<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_cite_element}</span>

mce/xhtmlxtras/del.htm CHANGED Viewed

	@@ -2,13 +2,13 @@
2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#xhtmlxtras_dlg.title_del_element}</title>
5	- <script type="text/javascript" src="../../tiny_mce_popup.js?ver=~~345~~"></script>
6	- <script type="text/javascript" src="../../utils/mctabs.js?ver=~~345~~"></script>
7	- <script type="text/javascript" src="../../utils/form_utils.js?ver=~~345~~"></script>
8	- <script type="text/javascript" src="../../utils/editable_selects.js?ver=~~345~~"></script>
9	- <script type="text/javascript" src="js/element_common.js?ver=~~345~~"></script>
10	- <script type="text/javascript" src="js/del.js?ver=~~345~~"></script>
11	- <link rel="stylesheet" type="text/css" href="css/popup.css?ver=~~345~~" />
12	</head>
13	<body id="xhtmlxtrasins" style="display: none" role="application" aria-labelledby="app_title">
14	<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_del_element}</span>


2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#xhtmlxtras_dlg.title_del_element}</title>
5	+ <script type="text/javascript" src="../../tiny_mce_popup.js?ver=349"></script>
6	+ <script type="text/javascript" src="../../utils/mctabs.js?ver=349"></script>
7	+ <script type="text/javascript" src="../../utils/form_utils.js?ver=349"></script>
8	+ <script type="text/javascript" src="../../utils/editable_selects.js?ver=349"></script>
9	+ <script type="text/javascript" src="js/element_common.js?ver=349"></script>
10	+ <script type="text/javascript" src="js/del.js?ver=349"></script>
11	+ <link rel="stylesheet" type="text/css" href="css/popup.css?ver=349" />
12	</head>
13	<body id="xhtmlxtrasins" style="display: none" role="application" aria-labelledby="app_title">
14	<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_del_element}</span>

mce/xhtmlxtras/ins.htm CHANGED Viewed

	@@ -2,13 +2,13 @@
2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#xhtmlxtras_dlg.title_ins_element}</title>
5	- <script type="text/javascript" src="../../tiny_mce_popup.js?ver=~~345~~"></script>
6	- <script type="text/javascript" src="../../utils/mctabs.js?ver=~~345~~"></script>
7	- <script type="text/javascript" src="../../utils/form_utils.js?ver=~~345~~"></script>
8	- <script type="text/javascript" src="../../utils/editable_selects.js?ver=~~345~~"></script>
9	- <script type="text/javascript" src="js/element_common.js?ver=~~345~~"></script>
10	- <script type="text/javascript" src="js/ins.js?ver=~~345~~"></script>
11	- <link rel="stylesheet" type="text/css" href="css/popup.css?ver=~~345~~" />
12	</head>
13	<body id="xhtmlxtrasins" style="display: none" role="application" aria-labelledby="app_title">
14	<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_ins_element}</span>


2	<html xmlns="http://www.w3.org/1999/xhtml">
3	<head>
4	<title>{#xhtmlxtras_dlg.title_ins_element}</title>
5	+ <script type="text/javascript" src="../../tiny_mce_popup.js?ver=349"></script>
6	+ <script type="text/javascript" src="../../utils/mctabs.js?ver=349"></script>
7	+ <script type="text/javascript" src="../../utils/form_utils.js?ver=349"></script>
8	+ <script type="text/javascript" src="../../utils/editable_selects.js?ver=349"></script>
9	+ <script type="text/javascript" src="js/element_common.js?ver=349"></script>
10	+ <script type="text/javascript" src="js/ins.js?ver=349"></script>
11	+ <link rel="stylesheet" type="text/css" href="css/popup.css?ver=349" />
12	</head>
13	<body id="xhtmlxtrasins" style="display: none" role="application" aria-labelledby="app_title">
14	<span style="display:none;" id="app_title">{#xhtmlxtras_dlg.title_ins_element}</span>

mce/xhtmlxtras/langs/ja_dlg.js CHANGED Viewed

@@ -1 +1 @@

- tinyMCE.addI18n('ja.xhtmlxtras_dlg',{"attribs_title":"\u5c5e\u6027\u306e\u633f\u5165/\u524a\u9664","option_rtl":"\u53f3\u304b\u3089\u5de6","option_ltr":"\u5de6\u304b\u3089\u53f3","insert_date":"\u73fe\u5728\u306e\u65e5\u4ed8/\u6642\u523b\u3092\u633f\u5165",remove:"~~Remove~~","title_cite_element":"\u5f15\u7528\~~u30a8~~\~~u30ec\u30e1\u30f3\u30c8~~","title_abbr_element":"\u7565\u8a9e\~~u30a8~~\~~u30ec\u30e1\u30f3\u30c8~~","title_acronym_element":"\u982d\u5b57\u8a9e\~~u30a8~~\~~u30ec\u30e1\u30f3\u30c8~~","title_del_element":"\~~u30a8~~\~~u30ec~~\~~u30e1\u30f3\u30c8\~~u3092\u524a\u9664","title_ins_element":"\~~u30a8~~\~~u30ec~~\~~u30e1\u30f3\u30c8\~~u3092\u633f\u5165","fieldset_events_tab":"\~~u30a8~~\~~u30ec~~\~~u30e1\u30f3\u30c8\~~u306e\u30a4\u30d9\u30f3\u30c8","fieldset_attrib_tab":"\~~u30a8~~\~~u30ec~~\~~u30e1\u30f3\u30c8\~~u306e\u5c5e\u6027","fieldset_general_tab":"\u4e00\u822c","events_tab":"\u30a4\u30d9\u30f3\u30c8","attrib_tab":"\u5c5e\u6027","general_tab":"\u4e00\u822c","attribute_attrib_tab":"\u5c5e\u6027","attribute_events_tab":"\u30a4\u30d9\u30f3\u30c8","attribute_label_accesskey":"\u30a2\u30af\u30bb\u30b9\u30ad\u30fc","attribute_label_tabindex":"\u30bf\u30d6\u30a4\u30f3\u30c7\u30c3\u30af\u30b9","attribute_label_langcode":"\u8a00\u8a9e","attribute_option_rtl":"\u53f3\u304b\u3089\u5de6","attribute_option_ltr":"\u5de6\u304b\u3089\u53f3","attribute_label_langdir":"\u6587\u7ae0\u306e\u65b9\u5411","attribute_label_datetime":"\u65e5\u4ed8/\u6642\u523b","attribute_label_cite":"\u5f15\u7528","attribute_label_style":"\u30b9\u30bf\u30a4\u30eb","attribute_label_class":"\u30af\u30e9\u30b9","attribute_label_id":"ID","attribute_label_title":"\u30bf\u30a4\u30c8\u30eb"});

+ tinyMCE.addI18n('ja.xhtmlxtras_dlg',{"attribs_title":"\u5c5e\u6027\u306e\u633f\u5165\u3084\u524a\u9664","option_rtl":"\u53f3\u304b\u3089\u5de6","option_ltr":"\u5de6\u304b\u3089\u53f3","insert_date":"\u73fe\u5728\u306e\u65e5\u4ed8\u3084\u6642\u523b\u3092\u633f\u5165",remove:"\u524a\u9664","title_cite_element":"\u5f15\u7528\u8981\u7d20","title_abbr_element":"\u7565\u8a9e\u8981\u7d20","title_acronym_element":"\u982d\u5b57\u8a9e\u8981\u7d20","title_del_element":"\u8981\u7d20\u3092\u524a\u9664","title_ins_element":"\u8981\u7d20\u3092\u633f\u5165","fieldset_events_tab":"\u8981\u7d20\u306e\u30a4\u30d9\u30f3\u30c8","fieldset_attrib_tab":"\u8981\u7d20\u306e\u5c5e\u6027","fieldset_general_tab":"\u4e00\u822c\u7684\u306a\u8a2d\u5b9a","events_tab":"\u30a4\u30d9\u30f3\u30c8","attrib_tab":"\u5c5e\u6027","general_tab":"\u4e00\u822c","attribute_attrib_tab":"\u5c5e\u6027","attribute_events_tab":"\u30a4\u30d9\u30f3\u30c8","attribute_label_accesskey":"\u30a2\u30af\u30bb\u30b9\u30ad\u30fc","attribute_label_tabindex":"\u30bf\u30d6\u30a4\u30f3\u30c7\u30c3\u30af\u30b9","attribute_label_langcode":"\u8a00\u8a9e","attribute_option_rtl":"\u53f3\u304b\u3089\u5de6","attribute_option_ltr":"\u5de6\u304b\u3089\u53f3","attribute_label_langdir":"\u6587\u7ae0\u306e\u65b9\u5411","attribute_label_datetime":"\u65e5\u4ed8/\u6642\u523b","attribute_label_cite":"\u5f15\u7528","attribute_label_style":"\u30b9\u30bf\u30a4\u30eb","attribute_label_class":"\u30af\u30e9\u30b9","attribute_label_id":"ID","attribute_label_title":"\u30bf\u30a4\u30c8\u30eb"});

readme.txt CHANGED Viewed

	@@ -2,8 +2,8 @@
2	Contributors: azaozz
3	Donate link:
4	Tags: wysiwyg, formatting, tinymce, write, editor
5	- Requires at least: 3.3
6	- Tested up to: 3.3
7	Stable tag: 3.4.5.1
8
9	Enables the advanced features of TinyMCE, the WordPress WYSIWYG editor.
	@@ -34,6 +34,9 @@ Best is to install directly from WordPress. If manual installation is required,
34
35	== Changelog ==
36



37	= 3.4.5.1 =
38	Fixed a bug preventing TinyMCE from importing CSS classes from editor-style.css.
39


2	Contributors: azaozz
3	Donate link:
4	Tags: wysiwyg, formatting, tinymce, write, editor
5	+ Requires at least: 3.4
6	+ Tested up to: 3.4
7	Stable tag: 3.4.5.1
8
9	Enables the advanced features of TinyMCE, the WordPress WYSIWYG editor.

34
35	== Changelog ==
36
37	+ = 3.4.9 =
38	+ Updated for WordPress 3.4 and TinyMCE 3.4.9.
39	+
40	= 3.4.5.1 =
41	Fixed a bug preventing TinyMCE from importing CSS classes from editor-style.css.
42

tadv_admin.php CHANGED Viewed

	@@ -14,62 +14,74 @@ if ( isset( $_POST['tadv_uninstall'] ) ) {
14	delete_option('tadv_btns3');
15	delete_option('tadv_btns4');
16	delete_option('tadv_allbtns');
17	- ?>
18	- ~~<div class="updated" style="margin-top:30px;">~~
19	- <~~p><?php~~ ~~_e('All options have been removed from the database. You can', 'tadv'); ?> <a href~~="~~plugins.php~~"~~><?php~~ ~~_e('deactivate TinyMCE Advanced', 'tadv'); ?></a> <?php _e('or', 'tadv'); ?> <a href~~=""> ~~<?php _e('reload this page', 'tadv'); ?></a> <?php _e('to reset them to the default values.', 'tadv'); ?></p>~~
20	- ~~</div~~>
21	- ~~<?php~~
22	- ~~return;~~


23	}
24
25	- if ( ! isset($GLOBALS['wp_version']) \|\| version_compare($GLOBALS['wp_version'], '3.1', '<') ) { // if less than ... ?>
26	- ~~<div class="error" style="margin-top:30px;">~~
27	- <~~p><?php~~ ~~_e('This~~ ~~plugin requires WordPress version 3.1 or newer. Please upgrade your WordPress installation or download an', 'tadv'); ?> <a href~~="~~http://wordpress.org/extend/plugins/tinymce~~-~~advanced/download/~~"~~><?php _e('older version of the plugin.', 'tadv'); ?></a></p~~>
28	- ~~</div~~>
29	- ~~<?php~~
30	- ~~return;~~


31	}
32
33	$imgpath = TADV_URL . 'images/';
34	$tadv_toolbars = get_option('tadv_toolbars');
35













36	if ( empty($tadv_toolbars) \|\| ! is_array($tadv_toolbars) ) {
37	@include_once( TADV_PATH . 'tadv_defaults.php');
38	} else {
39	$tadv_options = get_option('tadv_options');
40	- $tadv_toolbars['toolbar_1'] = isset($tadv_toolbars['toolbar_1']) ? (~~array~~) $tadv_toolbars['toolbar_1'] : array();
41	- $tadv_toolbars['toolbar_2'] = isset($tadv_toolbars['toolbar_2']) ? (~~array~~) $tadv_toolbars['toolbar_2'] : array();
42	- $tadv_toolbars['toolbar_3'] = isset($tadv_toolbars['toolbar_3']) ? (~~array~~) $tadv_toolbars['toolbar_3'] : array();
43	- $tadv_toolbars['toolbar_4'] = isset($tadv_toolbars['toolbar_4']) ? (~~array~~) $tadv_toolbars['toolbar_4'] : array();
44	}
45
46	if ( isset( $_POST['tadv-save'] ) ) {
47	check_admin_referer( 'tadv-save-buttons-order' );
48
49	- $~~tb1~~ = ~~$tb2 = $tb3 = $tb4 = $btns = array~~();
50	- ~~parse_str(~~ $~~_POST~~['~~toolbar_1order~~'], ~~$tb1~~ );
51	- ~~parse_str(~~ $~~_POST~~['~~toolbar_2order~~'], ~~$tb2~~ );
52	- ~~parse_str(~~ $~~_POST~~['~~toolbar_3order~~'], ~~$tb3~~ );
53	- ~~parse_str( $_POST['toolbar_4order'], $tb4 );~~
54	-
55	- $~~tadv_toolbars~~['~~toolbar_1~~'] = (~~array)~~ $~~tb1~~['~~pre~~'];
56	- $~~tadv_toolbars~~['~~toolbar_2~~'] = (~~array)~~ $~~tb2~~['~~pre~~'];
57	- $~~tadv_toolbars~~['~~toolbar_3~~'] = (~~array)~~ $~~tb3~~['~~pre~~'];
58	- ~~$tadv_toolbars['toolbar_4'] = (array) $tb4['pre'];~~
59	-
60	- $tadv_options['~~advlink1~~'] = $_POST['~~advlink1~~'] ? 1 : 0;
61	- $tadv_options['~~advimage~~'] = $_POST['~~advimage~~'] ? 1 : 0;
62	- $tadv_options['advlist'] = $_POST['advlist'] ? 1 : 0;
63	- $tadv_options['contextmenu'] = $_POST['contextmenu'] ? 1 : 0;
64	-
65	- $tadv_options['editorstyle'] = $_POST['editorstyle'] ? 1 : 0;
66	- $tadv_options['hideclasses'] = $_POST['hideclasses'] ? 1 : 0;
67	- $tadv_options['no_autop'] = $_POST['no_autop'] ? 1 : 0;
68
69	update_option( 'tadv_toolbars', $tadv_toolbars );
70	update_option( 'tadv_options', $tadv_options );
71	}
72

73	$hidden_row = 0;
74	$i = 0;
75	foreach ( $tadv_toolbars as $toolbar ) {
	@@ -109,59 +121,59 @@ if ( empty($toolbar_1) && empty($toolbar_2) && empty($toolbar_3) && empty($toolb
109	?><div class="error" id="message"><p><?php _e('All toolbars are empty! Default buttons loaded.', 'tadv'); ?></p></div><?php
110
111	@include_once( TADV_PATH . 'tadv_defaults.php' );
112	- $~~allbtns~~ = array_merge( $tadv_btns1, $tadv_btns2, $tadv_btns3, $tadv_btns4 );
113	} else {
114	- $~~allbtns~~ = array_merge( $toolbar_1, $toolbar_2, $toolbar_3, $toolbar_4 );
115	}
116
117	- if ( in_array('advhr', $~~allbtns~~, true) )
118	$plugins[] = 'advhr';
119
120	- if ( in_array('insertlayer', $~~allbtns~~, true) )
121	$plugins[] = 'layer';
122
123	- if ( in_array('visualchars', $~~allbtns~~, true) )
124	$plugins[] = 'visualchars';
125
126	- if ( in_array('nonbreaking', $~~allbtns~~, true) )
127	$plugins[] = 'nonbreaking';
128
129	- if ( in_array('styleprops', $~~allbtns~~, true) )
130	$plugins[] = 'style';
131
132	- if ( in_array('emotions', $~~allbtns~~, true) )
133	$plugins[] = 'emotions';
134
135	- if ( in_array('insertdate', $~~allbtns~~, true) \|\| in_array('inserttime', $~~allbtns~~, true) )
136	$plugins[] = 'insertdatetime';
137
138	- if ( in_array('tablecontrols', $~~allbtns~~, true) )
139	$plugins[] = 'table';
140
141	- if ( in_array('print', $~~allbtns~~, true) )
142	$plugins[] = 'print';
143
144	- if ( in_array('iespell', $~~allbtns~~, true) )
145	$plugins[] = 'iespell';
146
147	- if ( in_array('search', $~~allbtns~~, true) \|\| in_array('replace', $~~allbtns~~, true) )
148	$plugins[] = 'searchreplace';
149
150	- if ( in_array('cite', $~~allbtns~~, true) \|\| in_array('ins', $~~allbtns~~, true) \|\|
151	- in_array('del', $~~allbtns~~, true) \|\| in_array('abbr', $~~allbtns~~, true) \|\|
152	- in_array('acronym', $~~allbtns~~, true) \|\| in_array('attribs', $~~allbtns~~, true) )
153	$plugins[] = 'xhtmlxtras';
154
155	- if ( ~~isset~~($tadv_options['advlink1']) ~~&& $tadv_options['advlink1']~~ )
156	$plugins[] = 'advlink';
157
158	- if ( ~~isset~~($tadv_options['advlist']) ~~&& $tadv_options['advlist']~~ )
159	$plugins[] = 'advlist';
160
161	- if ( ~~isset~~($tadv_options['advimage']) ~~&& $tadv_options['advimage']~~ )
162	$plugins[] = 'advimage';
163
164	- if ( ~~isset~~($tadv_options['contextmenu']) ~~&& $tadv_options['contextmenu']~~ )
165	$plugins[] = 'contextmenu';
166
167	$buttons = array( 'Horizontal rule' => 'hr', 'Hide next row' => 'wp_adv', 'Quote' => 'blockquote', 'Bold' => 'bold', 'Italic' => 'italic', 'Strikethrough' => 'strikethrough', 'Underline' => 'underline', 'Bullet List' => 'bullist', 'Numbered List' => 'numlist', 'Outdent' => 'outdent', 'Indent' => 'indent', 'Allign Left' => 'justifyleft', 'Center' => 'justifycenter', 'Alligh Right' => 'justifyright', 'Justify' => 'justifyfull', 'Cut' => 'cut', 'Copy' => 'copy', 'Paste' => 'paste', 'Link' => 'link', 'Remove Link' => 'unlink', 'Insert Image' => 'image', 'More Tag' => 'wp_more', 'Split Page' => 'wp_page', 'Search' => 'search', 'Replace' => 'replace', '<!--fontselect-->' => 'fontselect', '<!--fontsizeselect-->' => 'fontsizeselect', 'Help' => 'wp_help', 'Full Screen' => 'fullscreen', '<!--styleselect-->' => 'styleselect', '<!--formatselect-->' => 'formatselect', 'Text Color' => 'forecolor', 'Back Color' => 'backcolor', 'Paste as Text' => 'pastetext', 'Paste from Word' => 'pasteword', 'Remove Format' => 'removeformat', 'Clean Code' => 'cleanup', 'Check Spelling' => 'spellchecker', 'Character Map' => 'charmap', 'Print' => 'print', 'Undo' => 'undo', 'Redo' => 'redo', 'Table' => 'tablecontrols', 'Citation' => 'cite', 'Inserted Text' => 'ins', 'Deleted Text' => 'del', 'Abbreviation' => 'abbr', 'Acronym' => 'acronym', 'XHTML Attribs' => 'attribs', 'Layer' => 'layer', 'Advanced HR' => 'advhr', 'View HTML' => 'code', 'Hidden Chars' => 'visualchars', 'NB Space' => 'nonbreaking', 'Sub' => 'sub', 'Sup' => 'sup', 'Visual Aids' => 'visualaid', 'Insert Date' => 'insertdate', 'Insert Time' => 'inserttime', 'Anchor' => 'anchor', 'Style' => 'styleprops', 'Smilies' => 'emotions', 'Insert Movie' => 'media', 'IE Spell' => 'iespell' );
	@@ -341,30 +353,30 @@ if ( is_array($buttons) ) {
341	Also enable:
342
343	<label for="advimage" class="tadv-box"><?php _e('Advanced Image', 'tadv'); ?>
344	- <input type="checkbox" class="tadv-chk" name="advimage" id="advimage" <?php if ( $tadv_options['advimage'] ~~== '1'~~ ) echo ' checked="checked"'; ?> /></label> •
345
346	<label for="advlist" class="tadv-box"><?php _e('Advanced List Options', 'tadv'); ?>
347	- <input type="checkbox" class="tadv-chk" name="advlist" id="advlist" <?php if ( $tadv_options['advlist'] ~~== '1'~~ ) echo ' checked="checked"'; ?> /></label> •
348
349	<label for="contextmenu" class="tadv-box"><?php _e('Context Menu', 'tadv'); ?>
350	- <input type="checkbox" class="tadv-chk" name="contextmenu" id="contextmenu" <?php if ( $tadv_options['contextmenu'] ~~== '1'~~ ) echo ' checked="checked"'; ?> /></label>
351	<?php _e('(to show the browser context menu in Firefox, hold down the Ctrl key).', 'tadv'); ?>
352	</td></tr>
353
354	<tr><td style="border:1px solid #CD0000;padding:2px 12px 8px;">
355	<p style="font-weight:bold;color:#CD0000;"><?php _e('Advanced Options', 'tadv'); ?></p>
356
357	- <p><input type="checkbox" class="tadv-chk" name="advlink1" id="advlink1" <?php if ( $tadv_options['advlink1'] ~~== '1'~~ ) echo ' checked="checked"'; ?> /> <label for="advlink1" class="tadv-box"><?php _e('Advanced Link', 'tadv'); ?></label> <?php _e('Enabling this TinyMCE plugin will overwrite the internal links feature in WordPress 3.1 and newer. Cuttently there is no way to enable both of them at the same time.', 'tadv'); ?></p>
358
359	<?php if ( ! current_theme_supports( 'editor-style' ) ) { ?>
360	<p><?php _e('It seems your theme (still) doesn\'t support customised styles for the editor. If you would like to use that, you can create a file named <i>editor-style.css</i> and add it to your theme\'s directory. You can use the editor-style.css from the Twenty Ten theme as a template.', 'tadv'); ?></p>
361
362	- <p><input type="checkbox" class="tadv-chk" name="editorstyle" id="editorstyle" <?php if ( $tadv_options['editorstyle'] ~~== '1'~~ ) echo ' checked="checked"'; ?> /> <label for="editorstyle" class="tadv-box"><?php _e('Import editor-style.css.', 'tadv'); ?></label> <?php _e('This is only needed if you created that file. Themes that style the editor will import the stylesheet automatically.', 'tadv'); ?></p>
363	<?php } ?>
364
365	- <p><input type="checkbox" class="tadv-chk" name="hideclasses" id="hideclasses" <?php if ( $tadv_options['hideclasses'] ~~== '1'~~ ) echo ' checked="checked"'; ?> /> <label for="hideclasses" class="tadv-box"><?php _e('Hide all CSS classes in the editor menus.', 'tadv'); ?></label> <?php _e('Note that selecting this will also disable the Styles drop-down menu.', 'tadv'); ?></p>
366
367	- <p><input type="checkbox" class="tadv-chk" name="no_autop" id="no_autop" <?php if ( $tadv_options['no_autop'] ~~== '1'~~ ) echo ' checked="checked"'; ?> /> <label for="no_autop" class="tadv-box"><?php _e('Stop removing the <p> and <br /> tags when saving and show them in the HTML editor', 'tadv'); ?></label> <?php _e('This will make it possible to use more advanced coding in the HTML editor without the back-end filtering affecting it much. However it may behave unexpectedly in rare cases, so test it thoroughly before enabling it permanently. Also line breaks in the HTML editor would still affect the output, in particular do not use empty lines, line breaks inside HTML tags or multiple <br /> tags.', 'tadv'); ?></p>
368	</td></tr>
369	<?php
370	$mce_locale = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) );
	@@ -372,7 +384,7 @@ if ( is_array($buttons) ) {
372	if ( ! @file_exists(TADV_PATH . 'mce/advlink/langs/' . $mce_locale . '_dlg.js') ) { ?>
373	<tr><td style="padding:2px 12px 8px;">
374	<p style="font-weight:bold;"><?php _e('Language Settings', 'tadv'); ?></p>
375	- <p><?php _e('Your WordPress language is set to', 'tadv'); ?> <strong><?php echo get_locale(); ?></strong>. <?php _e('However there is no matching language installed for TinyMCE plugins. This plugin includes several translations: German, French, Italian, Spanish, Portuguese, Russian, Japanese and Chinese. More translations are available at the', 'tadv'); ?> <a href="http://~~services~~.~~moxiecode~~.com/i18n/"><?php _e('TinyMCE web site.', 'tadv'); ?></a></p>
376	</td></tr>
377	<?php }
378	} // end mce_locale


14	delete_option('tadv_btns3');
15	delete_option('tadv_btns4');
16	delete_option('tadv_allbtns');
17	+
18	+ ?>
19	+ <div class="updated" style="margin-top:30px;">
20	+ <p><?php _e('All options have been removed from the database. You can', 'tadv'); ?> <a href="plugins.php"><?php _e('deactivate TinyMCE Advanced', 'tadv'); ?></a> <?php _e('or', 'tadv'); ?> <a href=""> <?php _e('reload this page', 'tadv'); ?></a> <?php _e('to reset them to the default values.', 'tadv'); ?></p>
21	+ </div>
22	+ <?php
23	+
24	+ return;
25	}
26
27	+ if ( ! isset($GLOBALS['wp_version']) \|\| version_compare($GLOBALS['wp_version'], '3.1', '<') ) { // if less than ...
28	+ ?>
29	+ <div class="error" style="margin-top:30px;">
30	+ <p><?php _e('This plugin requires WordPress version 3.1 or newer. Please upgrade your WordPress installation or download an', 'tadv'); ?> <a href="http://wordpress.org/extend/plugins/tinymce-advanced/download/"><?php _e('older version of the plugin.', 'tadv'); ?></a></p>
31	+ </div>
32	+ <?php
33	+
34	+ return;
35	}
36
37	$imgpath = TADV_URL . 'images/';
38	$tadv_toolbars = get_option('tadv_toolbars');
39
40	+ function _tadv_parse_buttons($row) {
41	+ $arr = array();
42	+
43	+ if ( !empty($_POST['toolbar_' . $row . 'order']) ) {
44	+ parse_str($_POST['toolbar_' . $row . 'order'], $arr);
45	+
46	+ if ( !empty($arr['pre']) && is_array($arr['pre']) )
47	+ $arr = $arr['pre'];
48	+ }
49	+
50	+ return $arr;
51	+ }
52	+
53	if ( empty($tadv_toolbars) \|\| ! is_array($tadv_toolbars) ) {
54	@include_once( TADV_PATH . 'tadv_defaults.php');
55	} else {
56	$tadv_options = get_option('tadv_options');
57	+ $tadv_toolbars['toolbar_1'] = isset($tadv_toolbars['toolbar_1']) && is_array($tadv_toolbars['toolbar_1']) ? $tadv_toolbars['toolbar_1'] : array();
58	+ $tadv_toolbars['toolbar_2'] = isset($tadv_toolbars['toolbar_2']) && is_array($tadv_toolbars['toolbar_2']) ? $tadv_toolbars['toolbar_2'] : array();
59	+ $tadv_toolbars['toolbar_3'] = isset($tadv_toolbars['toolbar_3']) && is_array($tadv_toolbars['toolbar_3']) ? $tadv_toolbars['toolbar_3'] : array();
60	+ $tadv_toolbars['toolbar_4'] = isset($tadv_toolbars['toolbar_4']) && is_array($tadv_toolbars['toolbar_4']) ? $tadv_toolbars['toolbar_4'] : array();
61	}
62
63	if ( isset( $_POST['tadv-save'] ) ) {
64	check_admin_referer( 'tadv-save-buttons-order' );
65
66	+ $tadv_toolbars['toolbar_1'] = _tadv_parse_buttons(1);
67	+ $tadv_toolbars['toolbar_2'] = _tadv_parse_buttons(2);
68	+ $tadv_toolbars['toolbar_3'] = _tadv_parse_buttons(3);
69	+ $tadv_toolbars['toolbar_4'] = _tadv_parse_buttons(4);
70	+
71	+ $tadv_options['advlink1'] = !empty($_POST['advlink1']) ? 1 : 0;
72	+ $tadv_options['advimage'] = !empty($_POST['advimage']) ? 1 : 0;
73	+ $tadv_options['advlist'] = !empty($_POST['advlist']) ? 1 : 0;
74	+ $tadv_options['contextmenu'] = !empty($_POST['contextmenu']) ? 1 : 0;
75	+
76	+ $tadv_options['editorstyle'] = !empty($_POST['editorstyle']) ? 1 : 0;
77	+ $tadv_options['hideclasses'] = !empty($_POST['hideclasses']) ? 1 : 0;
78	+ $tadv_options['no_autop'] = !empty($_POST['no_autop']) ? 1 : 0;






79
80	update_option( 'tadv_toolbars', $tadv_toolbars );
81	update_option( 'tadv_options', $tadv_options );
82	}
83
84	+ $btns = array();
85	$hidden_row = 0;
86	$i = 0;
87	foreach ( $tadv_toolbars as $toolbar ) {

121	?><div class="error" id="message"><p><?php _e('All toolbars are empty! Default buttons loaded.', 'tadv'); ?></p></div><?php
122
123	@include_once( TADV_PATH . 'tadv_defaults.php' );
124	+ $used_buttons = array_merge( $tadv_btns1, $tadv_btns2, $tadv_btns3, $tadv_btns4 );
125	} else {
126	+ $used_buttons = array_merge( $toolbar_1, $toolbar_2, $toolbar_3, $toolbar_4 );
127	}
128
129	+ if ( in_array('advhr', $used_buttons, true) )
130	$plugins[] = 'advhr';
131
132	+ if ( in_array('insertlayer', $used_buttons, true) )
133	$plugins[] = 'layer';
134
135	+ if ( in_array('visualchars', $used_buttons, true) )
136	$plugins[] = 'visualchars';
137
138	+ if ( in_array('nonbreaking', $used_buttons, true) )
139	$plugins[] = 'nonbreaking';
140
141	+ if ( in_array('styleprops', $used_buttons, true) )
142	$plugins[] = 'style';
143
144	+ if ( in_array('emotions', $used_buttons, true) )
145	$plugins[] = 'emotions';
146
147	+ if ( in_array('insertdate', $used_buttons, true) \|\| in_array('inserttime', $used_buttons, true) )
148	$plugins[] = 'insertdatetime';
149
150	+ if ( in_array('tablecontrols', $used_buttons, true) )
151	$plugins[] = 'table';
152
153	+ if ( in_array('print', $used_buttons, true) )
154	$plugins[] = 'print';
155
156	+ if ( in_array('iespell', $used_buttons, true) )
157	$plugins[] = 'iespell';
158
159	+ if ( in_array('search', $used_buttons, true) \|\| in_array('replace', $used_buttons, true) )
160	$plugins[] = 'searchreplace';
161
162	+ if ( in_array('cite', $used_buttons, true) \|\| in_array('ins', $used_buttons, true) \|\|
163	+ in_array('del', $used_buttons, true) \|\| in_array('abbr', $used_buttons, true) \|\|
164	+ in_array('acronym', $used_buttons, true) \|\| in_array('attribs', $used_buttons, true) )
165	$plugins[] = 'xhtmlxtras';
166
167	+ if ( !empty($tadv_options['advlink1']) )
168	$plugins[] = 'advlink';
169
170	+ if ( !empty($tadv_options['advlist']) )
171	$plugins[] = 'advlist';
172
173	+ if ( !empty($tadv_options['advimage']) )
174	$plugins[] = 'advimage';
175
176	+ if ( !empty($tadv_options['contextmenu']) )
177	$plugins[] = 'contextmenu';
178
179	$buttons = array( 'Horizontal rule' => 'hr', 'Hide next row' => 'wp_adv', 'Quote' => 'blockquote', 'Bold' => 'bold', 'Italic' => 'italic', 'Strikethrough' => 'strikethrough', 'Underline' => 'underline', 'Bullet List' => 'bullist', 'Numbered List' => 'numlist', 'Outdent' => 'outdent', 'Indent' => 'indent', 'Allign Left' => 'justifyleft', 'Center' => 'justifycenter', 'Alligh Right' => 'justifyright', 'Justify' => 'justifyfull', 'Cut' => 'cut', 'Copy' => 'copy', 'Paste' => 'paste', 'Link' => 'link', 'Remove Link' => 'unlink', 'Insert Image' => 'image', 'More Tag' => 'wp_more', 'Split Page' => 'wp_page', 'Search' => 'search', 'Replace' => 'replace', '<!--fontselect-->' => 'fontselect', '<!--fontsizeselect-->' => 'fontsizeselect', 'Help' => 'wp_help', 'Full Screen' => 'fullscreen', '<!--styleselect-->' => 'styleselect', '<!--formatselect-->' => 'formatselect', 'Text Color' => 'forecolor', 'Back Color' => 'backcolor', 'Paste as Text' => 'pastetext', 'Paste from Word' => 'pasteword', 'Remove Format' => 'removeformat', 'Clean Code' => 'cleanup', 'Check Spelling' => 'spellchecker', 'Character Map' => 'charmap', 'Print' => 'print', 'Undo' => 'undo', 'Redo' => 'redo', 'Table' => 'tablecontrols', 'Citation' => 'cite', 'Inserted Text' => 'ins', 'Deleted Text' => 'del', 'Abbreviation' => 'abbr', 'Acronym' => 'acronym', 'XHTML Attribs' => 'attribs', 'Layer' => 'layer', 'Advanced HR' => 'advhr', 'View HTML' => 'code', 'Hidden Chars' => 'visualchars', 'NB Space' => 'nonbreaking', 'Sub' => 'sub', 'Sup' => 'sup', 'Visual Aids' => 'visualaid', 'Insert Date' => 'insertdate', 'Insert Time' => 'inserttime', 'Anchor' => 'anchor', 'Style' => 'styleprops', 'Smilies' => 'emotions', 'Insert Movie' => 'media', 'IE Spell' => 'iespell' );

353	Also enable:
354
355	<label for="advimage" class="tadv-box"><?php _e('Advanced Image', 'tadv'); ?>
356	+ <input type="checkbox" class="tadv-chk" name="advimage" id="advimage" <?php if ( !empty($tadv_options['advimage']) ) echo ' checked="checked"'; ?> /></label> •
357
358	<label for="advlist" class="tadv-box"><?php _e('Advanced List Options', 'tadv'); ?>
359	+ <input type="checkbox" class="tadv-chk" name="advlist" id="advlist" <?php if ( !empty($tadv_options['advlist']) ) echo ' checked="checked"'; ?> /></label> •
360
361	<label for="contextmenu" class="tadv-box"><?php _e('Context Menu', 'tadv'); ?>
362	+ <input type="checkbox" class="tadv-chk" name="contextmenu" id="contextmenu" <?php if ( !empty($tadv_options['contextmenu']) ) echo ' checked="checked"'; ?> /></label>
363	<?php _e('(to show the browser context menu in Firefox, hold down the Ctrl key).', 'tadv'); ?>
364	</td></tr>
365
366	<tr><td style="border:1px solid #CD0000;padding:2px 12px 8px;">
367	<p style="font-weight:bold;color:#CD0000;"><?php _e('Advanced Options', 'tadv'); ?></p>
368
369	+ <p><input type="checkbox" class="tadv-chk" name="advlink1" id="advlink1" <?php if ( !empty($tadv_options['advlink1']) ) echo ' checked="checked"'; ?> /> <label for="advlink1" class="tadv-box"><?php _e('Advanced Link', 'tadv'); ?></label> <?php _e('Enabling this TinyMCE plugin will overwrite the internal links feature in WordPress 3.1 and newer. Cuttently there is no way to enable both of them at the same time.', 'tadv'); ?></p>
370
371	<?php if ( ! current_theme_supports( 'editor-style' ) ) { ?>
372	<p><?php _e('It seems your theme (still) doesn\'t support customised styles for the editor. If you would like to use that, you can create a file named <i>editor-style.css</i> and add it to your theme\'s directory. You can use the editor-style.css from the Twenty Ten theme as a template.', 'tadv'); ?></p>
373
374	+ <p><input type="checkbox" class="tadv-chk" name="editorstyle" id="editorstyle" <?php if ( !empty($tadv_options['editorstyle']) ) echo ' checked="checked"'; ?> /> <label for="editorstyle" class="tadv-box"><?php _e('Import editor-style.css.', 'tadv'); ?></label> <?php _e('This is only needed if you created that file. Themes that style the editor will import the stylesheet automatically.', 'tadv'); ?></p>
375	<?php } ?>
376
377	+ <p><input type="checkbox" class="tadv-chk" name="hideclasses" id="hideclasses" <?php if ( !empty($tadv_options['hideclasses']) ) echo ' checked="checked"'; ?> /> <label for="hideclasses" class="tadv-box"><?php _e('Hide all CSS classes in the editor menus.', 'tadv'); ?></label> <?php _e('Note that selecting this will also disable the Styles drop-down menu.', 'tadv'); ?></p>
378
379	+ <p><input type="checkbox" class="tadv-chk" name="no_autop" id="no_autop" <?php if ( !empty($tadv_options['no_autop']) ) echo ' checked="checked"'; ?> /> <label for="no_autop" class="tadv-box"><?php _e('Stop removing the <p> and <br /> tags when saving and show them in the HTML editor', 'tadv'); ?></label> <?php _e('This will make it possible to use more advanced coding in the HTML editor without the back-end filtering affecting it much. However it may behave unexpectedly in rare cases, so test it thoroughly before enabling it permanently. Also line breaks in the HTML editor would still affect the output, in particular do not use empty lines, line breaks inside HTML tags or multiple <br /> tags.', 'tadv'); ?></p>
380	</td></tr>
381	<?php
382	$mce_locale = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) );

384	if ( ! @file_exists(TADV_PATH . 'mce/advlink/langs/' . $mce_locale . '_dlg.js') ) { ?>
385	<tr><td style="padding:2px 12px 8px;">
386	<p style="font-weight:bold;"><?php _e('Language Settings', 'tadv'); ?></p>
387	+ <p><?php _e('Your WordPress language is set to', 'tadv'); ?> <strong><?php echo get_locale(); ?></strong>. <?php _e('However there is no matching language installed for TinyMCE plugins. This plugin includes several translations: German, French, Italian, Spanish, Portuguese, Russian, Japanese and Chinese. More translations are available at the', 'tadv'); ?> <a href="http://www.tinymce.com/i18n/index.php?ctrl=lang&act=download&pr_id=1"><?php _e('TinyMCE web site.', 'tadv'); ?></a></p>
388	</td></tr>
389	<?php }
390	} // end mce_locale

tinymce-advanced.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	Plugin Name: TinyMCE Advanced
4	Plugin URI: http://www.laptoptips.ca/projects/tinymce-advanced/
5	Description: Enables advanced features and plugins in TinyMCE, the visual editor in WordPress.
6	- Version: 3.4.~~5.1~~
7	Author: Andrew Ozz
8	Author URI: http://www.laptoptips.ca/
9


3	Plugin Name: TinyMCE Advanced
4	Plugin URI: http://www.laptoptips.ca/projects/tinymce-advanced/
5	Description: Enables advanced features and plugins in TinyMCE, the visual editor in WordPress.
6	+ Version: 3.4.9
7	Author: Andrew Ozz
8	Author URI: http://www.laptoptips.ca/
9