alchemy_cms 2.4.rc2 → 2.4.rc4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (122) hide show
  1. data/.gitignore +2 -1
  2. data/.travis.yml +7 -4
  3. data/README.md +1 -0
  4. data/alchemy_cms.gemspec +19 -1
  5. data/app/assets/javascripts/alchemy/alchemy.dragndrop.js +5 -2
  6. data/app/assets/javascripts/alchemy/alchemy.link_overlay.js.coffee +1 -1
  7. data/app/assets/javascripts/alchemy/alchemy.preview_window.js +4 -21
  8. data/app/assets/javascripts/alchemy/alchemy.windows.js +0 -1
  9. data/app/assets/stylesheets/alchemy/base.scss +4 -0
  10. data/app/assets/stylesheets/alchemy/elements.scss +59 -60
  11. data/app/assets/stylesheets/alchemy/flash.scss +3 -3
  12. data/app/assets/stylesheets/alchemy/form_elements.scss +15 -2
  13. data/app/assets/stylesheets/alchemy/jquery-ui.scss +11 -3
  14. data/app/assets/stylesheets/alchemy/mixins.scss +9 -0
  15. data/app/assets/stylesheets/alchemy/tinymce_content.css.scss +1 -1
  16. data/app/assets/stylesheets/alchemy/tinymce_dialog.css.scss +4 -0
  17. data/app/assets/stylesheets/alchemy/variables.scss +5 -1
  18. data/app/controllers/alchemy/admin/base_controller.rb +18 -3
  19. data/app/controllers/alchemy/admin/elements_controller.rb +4 -7
  20. data/app/controllers/alchemy/admin/pages_controller.rb +3 -4
  21. data/app/controllers/alchemy/admin/resources_controller.rb +1 -18
  22. data/app/controllers/alchemy/admin/users_controller.rb +8 -5
  23. data/app/helpers/alchemy/admin/pages_helper.rb +6 -1
  24. data/app/models/alchemy/content.rb +26 -5
  25. data/app/models/alchemy/element.rb +1 -0
  26. data/app/models/alchemy/essence_richtext.rb +1 -1
  27. data/app/models/alchemy/page.rb +131 -88
  28. data/app/views/alchemy/admin/clipboard/insert.js.erb +1 -1
  29. data/app/views/alchemy/admin/elements/create.js.erb +6 -1
  30. data/app/views/alchemy/admin/elements/trash.js.erb +1 -3
  31. data/app/views/alchemy/admin/resources/_form.html.erb +13 -1
  32. data/app/views/alchemy/admin/trash/index.html.erb +1 -1
  33. data/app/views/alchemy/base/remote_errors.js.erb +5 -1
  34. data/app/views/alchemy/essences/_essence_link_view.html.erb +2 -0
  35. data/app/views/alchemy/essences/_essence_richtext_editor.html.erb +1 -1
  36. data/config/locales/alchemy.de.yml +11 -4
  37. data/lib/alchemy/capistrano.rb +59 -1
  38. data/lib/alchemy/essence.rb +1 -0
  39. data/lib/alchemy/seeder.rb +39 -49
  40. data/lib/alchemy/tinymce.rb +1 -1
  41. data/lib/alchemy/version.rb +1 -1
  42. data/lib/rails/generators/alchemy/deploy_script/deploy_script_generator.rb +1 -1
  43. data/lib/rails/generators/alchemy/deploy_script/templates/deploy.rb.tt +3 -0
  44. data/lib/rails/generators/alchemy/elements/templates/view.html.haml +2 -2
  45. data/lib/rails/generators/alchemy/elements/templates/view.html.slim +2 -2
  46. data/lib/tasks/database.rake +25 -0
  47. data/lib/tasks/install.rake +5 -14
  48. data/spec/factories.rb +10 -0
  49. data/spec/integration/admin/resources_integration_spec.rb +64 -23
  50. data/spec/integration/pages_controller_spec.rb +0 -2
  51. data/spec/libraries/resources_helper_spec.rb +6 -2
  52. data/spec/models/content_spec.rb +31 -0
  53. data/spec/models/element_spec.rb +7 -2
  54. data/spec/models/page_spec.rb +36 -0
  55. data/vendor/assets/javascripts/jquery_plugins/jquery.dialogextend.1_0_1.js +676 -0
  56. data/vendor/assets/javascripts/jquery_plugins/jquery.ui.tabspaging.js +298 -238
  57. data/vendor/assets/javascripts/tiny_mce/langs/de.js +1 -1
  58. data/vendor/assets/javascripts/tiny_mce/langs/en.js +1 -1
  59. data/vendor/assets/javascripts/tiny_mce/license.txt +6 -6
  60. data/vendor/assets/javascripts/tiny_mce/plugins/fullscreen/editor_plugin.js +1 -1
  61. data/vendor/assets/javascripts/tiny_mce/plugins/fullscreen/fullscreen.htm +97 -97
  62. data/vendor/assets/javascripts/tiny_mce/plugins/inlinepopups/template.htm +376 -386
  63. data/vendor/assets/javascripts/tiny_mce/plugins/paste/editor_plugin.js +1 -1
  64. data/vendor/assets/javascripts/tiny_mce/plugins/paste/js/pastetext.js +30 -30
  65. data/vendor/assets/javascripts/tiny_mce/plugins/paste/js/pasteword.js +45 -45
  66. data/vendor/assets/javascripts/tiny_mce/plugins/paste/langs/de_dlg.js +1 -1
  67. data/vendor/assets/javascripts/tiny_mce/plugins/paste/pastetext.htm +17 -20
  68. data/vendor/assets/javascripts/tiny_mce/plugins/paste/pasteword.htm +12 -12
  69. data/vendor/assets/javascripts/tiny_mce/plugins/table/cell.htm +173 -183
  70. data/vendor/assets/javascripts/tiny_mce/plugins/table/css/cell.css +4 -4
  71. data/vendor/assets/javascripts/tiny_mce/plugins/table/css/row.css +7 -7
  72. data/vendor/assets/javascripts/tiny_mce/plugins/table/css/table.css +3 -3
  73. data/vendor/assets/javascripts/tiny_mce/plugins/table/editor_plugin.js +1 -1
  74. data/vendor/assets/javascripts/tiny_mce/plugins/table/js/cell.js +280 -282
  75. data/vendor/assets/javascripts/tiny_mce/plugins/table/js/merge_cells.js +15 -15
  76. data/vendor/assets/javascripts/tiny_mce/plugins/table/js/row.js +221 -204
  77. data/vendor/assets/javascripts/tiny_mce/plugins/table/js/table.js +448 -435
  78. data/vendor/assets/javascripts/tiny_mce/plugins/table/langs/de_dlg.js +1 -1
  79. data/vendor/assets/javascripts/tiny_mce/plugins/table/merge_cells.htm +22 -24
  80. data/vendor/assets/javascripts/tiny_mce/plugins/table/row.htm +136 -144
  81. data/vendor/assets/javascripts/tiny_mce/plugins/table/table.htm +168 -184
  82. data/vendor/assets/javascripts/tiny_mce/themes/advanced/about.htm +46 -62
  83. data/vendor/assets/javascripts/tiny_mce/themes/advanced/anchor.htm +16 -17
  84. data/vendor/assets/javascripts/tiny_mce/themes/advanced/charmap.htm +47 -56
  85. data/vendor/assets/javascripts/tiny_mce/themes/advanced/color_picker.htm +52 -69
  86. data/vendor/assets/javascripts/tiny_mce/themes/advanced/editor_template.js +1 -852
  87. data/vendor/assets/javascripts/tiny_mce/themes/advanced/image.htm +69 -79
  88. data/vendor/assets/javascripts/tiny_mce/themes/advanced/img/icons.gif +0 -0
  89. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/about.js +48 -48
  90. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/anchor.js +50 -37
  91. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/charmap.js +317 -317
  92. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/color_picker.js +345 -331
  93. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/image.js +248 -246
  94. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/link.js +152 -146
  95. data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/source_editor.js +53 -31
  96. data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/de.js +1 -1
  97. data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/de_dlg.js +1 -1
  98. data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/en.js +1 -1
  99. data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/en_dlg.js +1 -1
  100. data/vendor/assets/javascripts/tiny_mce/themes/advanced/link.htm +46 -53
  101. data/vendor/assets/javascripts/tiny_mce/themes/advanced/shortcuts.htm +45 -57
  102. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/content.css +47 -182
  103. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/dialog.css +93 -399
  104. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/ui.css +191 -890
  105. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/highcontrast/content.css +24 -102
  106. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css +79 -377
  107. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css +80 -451
  108. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/content.css +45 -167
  109. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css +93 -399
  110. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui.css +194 -889
  111. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css +7 -33
  112. data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css +4 -15
  113. data/vendor/assets/javascripts/tiny_mce/themes/advanced/source_editor.htm +16 -19
  114. data/vendor/assets/javascripts/tiny_mce/tiny_mce.js +1 -1
  115. data/vendor/assets/javascripts/tiny_mce/tiny_mce_popup.js +1 -1
  116. data/vendor/assets/javascripts/tiny_mce/utils/editable_selects.js +46 -46
  117. data/vendor/assets/javascripts/tiny_mce/utils/form_utils.js +124 -124
  118. data/vendor/assets/javascripts/tiny_mce/utils/mctabs.js +112 -112
  119. data/vendor/assets/javascripts/tiny_mce/utils/validate.js +213 -213
  120. metadata +11 -6
  121. data/spec/dummy/public/404.html.bak +0 -26
  122. data/vendor/assets/javascripts/jquery_plugins/jquery.dialogextend.min.js +0 -8
@@ -1,90 +1,80 @@
1
1
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2
2
  <html xmlns="http://www.w3.org/1999/xhtml">
3
3
  <head>
4
- <title>{#advanced_dlg.image_title}</title>
5
- <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
6
- <script type="text/javascript" src="../../utils/mctabs.js"></script>
7
- <script type="text/javascript" src="../../utils/form_utils.js"></script>
8
- <script type="text/javascript" src="js/image.js"></script>
4
+ <title>{#advanced_dlg.image_title}</title>
5
+ <script type="text/javascript" src="../../tiny_mce_popup.js"></script>
6
+ <script type="text/javascript" src="../../utils/mctabs.js"></script>
7
+ <script type="text/javascript" src="../../utils/form_utils.js"></script>
8
+ <script type="text/javascript" src="js/image.js"></script>
9
9
  </head>
10
10
  <body id="image" style="display: none">
11
11
  <form onsubmit="ImageDialog.update();return false;" action="#">
12
- <div class="tabs">
13
- <ul>
14
- <li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');"
15
- onmousedown="return false;">{#advanced_dlg.image_title}</a></span>
16
- </li>
17
- </ul>
18
- </div>
12
+ <div class="tabs">
13
+ <ul>
14
+ <li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advanced_dlg.image_title}</a></span></li>
15
+ </ul>
16
+ </div>
19
17
 
20
- <div class="panel_wrapper">
21
- <div id="general_panel" class="panel current">
22
- <table border="0" cellpadding="4" cellspacing="0">
23
- <tr>
24
- <td class="nowrap"><label for="src">{#advanced_dlg.image_src}</label></td>
25
- <td>
26
- <table border="0" cellspacing="0" cellpadding="0">
27
- <tr>
28
- <td><input id="src" name="src" type="text" class="mceFocus" value="" style="width: 200px"
29
- onchange="ImageDialog.getImageData();"/></td>
30
- <td id="srcbrowsercontainer">&nbsp;</td>
31
- </tr>
32
- </table>
33
- </td>
34
- </tr>
35
- <tr>
36
- <td><label for="image_list">{#advanced_dlg.image_list}</label></td>
37
- <td><select id="image_list" name="image_list"
38
- onchange="document.getElementById('src').value=this.options[this.selectedIndex].value;document.getElementById('alt').value=this.options[this.selectedIndex].text;"></select>
39
- </td>
40
- </tr>
41
- <tr>
42
- <td class="nowrap"><label for="alt">{#advanced_dlg.image_alt}</label></td>
43
- <td><input id="alt" name="alt" type="text" value="" style="width: 200px"/></td>
44
- </tr>
45
- <tr>
46
- <td class="nowrap"><label for="align">{#advanced_dlg.image_align}</label></td>
47
- <td><select id="align" name="align" onchange="ImageDialog.updateStyle();">
48
- <option value="">{#not_set}</option>
49
- <option value="baseline">{#advanced_dlg.image_align_baseline}</option>
50
- <option value="top">{#advanced_dlg.image_align_top}</option>
51
- <option value="middle">{#advanced_dlg.image_align_middle}</option>
52
- <option value="bottom">{#advanced_dlg.image_align_bottom}</option>
53
- <option value="text-top">{#advanced_dlg.image_align_texttop}</option>
54
- <option value="text-bottom">{#advanced_dlg.image_align_textbottom}</option>
55
- <option value="left">{#advanced_dlg.image_align_left}</option>
56
- <option value="right">{#advanced_dlg.image_align_right}</option>
57
- </select></td>
58
- </tr>
59
- <tr>
60
- <td class="nowrap"><label for="width">{#advanced_dlg.image_dimensions}</label></td>
61
- <td><input id="width" name="width" type="text" value="" size="3" maxlength="5"/>
62
- x
63
- <input id="height" name="height" type="text" value="" size="3" maxlength="5"/></td>
64
- </tr>
65
- <tr>
66
- <td class="nowrap"><label for="border">{#advanced_dlg.image_border}</label></td>
67
- <td><input id="border" name="border" type="text" value="" size="3" maxlength="3"
68
- onchange="ImageDialog.updateStyle();"/></td>
69
- </tr>
70
- <tr>
71
- <td class="nowrap"><label for="vspace">{#advanced_dlg.image_vspace}</label></td>
72
- <td><input id="vspace" name="vspace" type="text" value="" size="3" maxlength="3"
73
- onchange="ImageDialog.updateStyle();"/></td>
74
- </tr>
75
- <tr>
76
- <td class="nowrap"><label for="hspace">{#advanced_dlg.image_hspace}</label></td>
77
- <td><input id="hspace" name="hspace" type="text" value="" size="3" maxlength="3"
78
- onchange="ImageDialog.updateStyle();"/></td>
79
- </tr>
80
- </table>
81
- </div>
82
- </div>
18
+ <div class="panel_wrapper">
19
+ <div id="general_panel" class="panel current">
20
+ <table border="0" cellpadding="4" cellspacing="0">
21
+ <tr>
22
+ <td class="nowrap"><label for="src">{#advanced_dlg.image_src}</label></td>
23
+ <td><table border="0" cellspacing="0" cellpadding="0">
24
+ <tr>
25
+ <td><input id="src" name="src" type="text" class="mceFocus" value="" style="width: 200px" onchange="ImageDialog.getImageData();" /></td>
26
+ <td id="srcbrowsercontainer">&nbsp;</td>
27
+ </tr>
28
+ </table></td>
29
+ </tr>
30
+ <tr>
31
+ <td><label for="image_list">{#advanced_dlg.image_list}</label></td>
32
+ <td><select id="image_list" name="image_list" onchange="document.getElementById('src').value=this.options[this.selectedIndex].value;document.getElementById('alt').value=this.options[this.selectedIndex].text;"></select></td>
33
+ </tr>
34
+ <tr>
35
+ <td class="nowrap"><label for="alt">{#advanced_dlg.image_alt}</label></td>
36
+ <td><input id="alt" name="alt" type="text" value="" style="width: 200px" /></td>
37
+ </tr>
38
+ <tr>
39
+ <td class="nowrap"><label for="align">{#advanced_dlg.image_align}</label></td>
40
+ <td><select id="align" name="align" onchange="ImageDialog.updateStyle();">
41
+ <option value="">{#not_set}</option>
42
+ <option value="baseline">{#advanced_dlg.image_align_baseline}</option>
43
+ <option value="top">{#advanced_dlg.image_align_top}</option>
44
+ <option value="middle">{#advanced_dlg.image_align_middle}</option>
45
+ <option value="bottom">{#advanced_dlg.image_align_bottom}</option>
46
+ <option value="text-top">{#advanced_dlg.image_align_texttop}</option>
47
+ <option value="text-bottom">{#advanced_dlg.image_align_textbottom}</option>
48
+ <option value="left">{#advanced_dlg.image_align_left}</option>
49
+ <option value="right">{#advanced_dlg.image_align_right}</option>
50
+ </select></td>
51
+ </tr>
52
+ <tr>
53
+ <td class="nowrap"><label for="width">{#advanced_dlg.image_dimensions}</label></td>
54
+ <td><input id="width" name="width" type="text" value="" size="3" maxlength="5" />
55
+ x
56
+ <input id="height" name="height" type="text" value="" size="3" maxlength="5" /></td>
57
+ </tr>
58
+ <tr>
59
+ <td class="nowrap"><label for="border">{#advanced_dlg.image_border}</label></td>
60
+ <td><input id="border" name="border" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>
61
+ </tr>
62
+ <tr>
63
+ <td class="nowrap"><label for="vspace">{#advanced_dlg.image_vspace}</label></td>
64
+ <td><input id="vspace" name="vspace" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>
65
+ </tr>
66
+ <tr>
67
+ <td class="nowrap"><label for="hspace">{#advanced_dlg.image_hspace}</label></td>
68
+ <td><input id="hspace" name="hspace" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>
69
+ </tr>
70
+ </table>
71
+ </div>
72
+ </div>
83
73
 
84
- <div class="mceActionPanel">
85
- <input type="submit" id="insert" name="insert" value="{#insert}"/>
86
- <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();"/>
87
- </div>
74
+ <div class="mceActionPanel">
75
+ <input type="submit" id="insert" name="insert" value="{#insert}" />
76
+ <input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
77
+ </div>
88
78
  </form>
89
79
  </body>
90
80
  </html>
@@ -1,73 +1,73 @@
1
1
  tinyMCEPopup.requireLangPack();
2
2
 
3
3
  function init() {
4
- var ed, tcont;
4
+ var ed, tcont;
5
5
 
6
- tinyMCEPopup.resizeToInnerSize();
7
- ed = tinyMCEPopup.editor;
6
+ tinyMCEPopup.resizeToInnerSize();
7
+ ed = tinyMCEPopup.editor;
8
8
 
9
- // Give FF some time
10
- window.setTimeout(insertHelpIFrame, 10);
9
+ // Give FF some time
10
+ window.setTimeout(insertHelpIFrame, 10);
11
11
 
12
- tcont = document.getElementById('plugintablecontainer');
13
- document.getElementById('plugins_tab').style.display = 'none';
12
+ tcont = document.getElementById('plugintablecontainer');
13
+ document.getElementById('plugins_tab').style.display = 'none';
14
14
 
15
- var html = "";
16
- html += '<table id="plugintable">';
17
- html += '<thead>';
18
- html += '<tr>';
19
- html += '<td>' + ed.getLang('advanced_dlg.about_plugin') + '</td>';
20
- html += '<td>' + ed.getLang('advanced_dlg.about_author') + '</td>';
21
- html += '<td>' + ed.getLang('advanced_dlg.about_version') + '</td>';
22
- html += '</tr>';
23
- html += '</thead>';
24
- html += '<tbody>';
15
+ var html = "";
16
+ html += '<table id="plugintable">';
17
+ html += '<thead>';
18
+ html += '<tr>';
19
+ html += '<td>' + ed.getLang('advanced_dlg.about_plugin') + '</td>';
20
+ html += '<td>' + ed.getLang('advanced_dlg.about_author') + '</td>';
21
+ html += '<td>' + ed.getLang('advanced_dlg.about_version') + '</td>';
22
+ html += '</tr>';
23
+ html += '</thead>';
24
+ html += '<tbody>';
25
25
 
26
- tinymce.each(ed.plugins, function (p, n) {
27
- var info;
26
+ tinymce.each(ed.plugins, function(p, n) {
27
+ var info;
28
28
 
29
- if (!p.getInfo)
30
- return;
29
+ if (!p.getInfo)
30
+ return;
31
31
 
32
- html += '<tr>';
32
+ html += '<tr>';
33
33
 
34
- info = p.getInfo();
34
+ info = p.getInfo();
35
35
 
36
- if (info.infourl != null && info.infourl != '')
37
- html += '<td width="50%" title="' + n + '"><a href="' + info.infourl + '" target="_blank">' + info.longname + '</a></td>';
38
- else
39
- html += '<td width="50%" title="' + n + '">' + info.longname + '</td>';
36
+ if (info.infourl != null && info.infourl != '')
37
+ html += '<td width="50%" title="' + n + '"><a href="' + info.infourl + '" target="_blank">' + info.longname + '</a></td>';
38
+ else
39
+ html += '<td width="50%" title="' + n + '">' + info.longname + '</td>';
40
40
 
41
- if (info.authorurl != null && info.authorurl != '')
42
- html += '<td width="35%"><a href="' + info.authorurl + '" target="_blank">' + info.author + '</a></td>';
43
- else
44
- html += '<td width="35%">' + info.author + '</td>';
41
+ if (info.authorurl != null && info.authorurl != '')
42
+ html += '<td width="35%"><a href="' + info.authorurl + '" target="_blank">' + info.author + '</a></td>';
43
+ else
44
+ html += '<td width="35%">' + info.author + '</td>';
45
45
 
46
- html += '<td width="15%">' + info.version + '</td>';
47
- html += '</tr>';
46
+ html += '<td width="15%">' + info.version + '</td>';
47
+ html += '</tr>';
48
48
 
49
- document.getElementById('plugins_tab').style.display = '';
49
+ document.getElementById('plugins_tab').style.display = '';
50
50
 
51
- });
51
+ });
52
52
 
53
- html += '</tbody>';
54
- html += '</table>';
53
+ html += '</tbody>';
54
+ html += '</table>';
55
55
 
56
- tcont.innerHTML = html;
56
+ tcont.innerHTML = html;
57
57
 
58
- tinyMCEPopup.dom.get('version').innerHTML = tinymce.majorVersion + "." + tinymce.minorVersion;
59
- tinyMCEPopup.dom.get('date').innerHTML = tinymce.releaseDate;
58
+ tinyMCEPopup.dom.get('version').innerHTML = tinymce.majorVersion + "." + tinymce.minorVersion;
59
+ tinyMCEPopup.dom.get('date').innerHTML = tinymce.releaseDate;
60
60
  }
61
61
 
62
62
  function insertHelpIFrame() {
63
- var html;
64
-
65
- if (tinyMCEPopup.getParam('docs_url')) {
66
- html = '<iframe width="100%" height="300" src="' + tinyMCEPopup.editor.baseURI.toAbsolute(tinyMCEPopup.getParam('docs_url')) + '"></iframe>';
67
- document.getElementById('iframecontainer').innerHTML = html;
68
- document.getElementById('help_tab').style.display = 'block';
69
- document.getElementById('help_tab').setAttribute("aria-hidden", "false");
70
- }
63
+ var html;
64
+
65
+ if (tinyMCEPopup.getParam('docs_url')) {
66
+ html = '<iframe width="100%" height="300" src="' + tinyMCEPopup.editor.baseURI.toAbsolute(tinyMCEPopup.getParam('docs_url')) + '"></iframe>';
67
+ document.getElementById('iframecontainer').innerHTML = html;
68
+ document.getElementById('help_tab').style.display = 'block';
69
+ document.getElementById('help_tab').setAttribute("aria-hidden", "false");
70
+ }
71
71
  }
72
72
 
73
73
  tinyMCEPopup.onInit.add(init);
@@ -1,43 +1,56 @@
1
1
  tinyMCEPopup.requireLangPack();
2
2
 
3
3
  var AnchorDialog = {
4
- init:function (ed) {
5
- var action, elm, f = document.forms[0];
6
-
7
- this.editor = ed;
8
- elm = ed.dom.getParent(ed.selection.getNode(), 'A');
9
- v = ed.dom.getAttrib(elm, 'name');
10
-
11
- if (v) {
12
- this.action = 'update';
13
- f.anchorName.value = v;
14
- }
15
-
16
- f.insert.value = ed.getLang(elm ? 'update' : 'insert');
17
- },
18
-
19
- update:function () {
20
- var ed = this.editor, elm, name = document.forms[0].anchorName.value;
21
-
22
- if (!name || !/^[a-z][a-z0-9\-\_:\.]*$/i.test(name)) {
23
- tinyMCEPopup.alert('advanced_dlg.anchor_invalid');
24
- return;
25
- }
26
-
27
- tinyMCEPopup.restoreSelection();
28
-
29
- if (this.action != 'update')
30
- ed.selection.collapse(1);
31
-
32
- elm = ed.dom.getParent(ed.selection.getNode(), 'A');
33
- if (elm) {
34
- elm.setAttribute('name', name);
35
- elm.name = name;
36
- } else
37
- ed.execCommand('mceInsertContent', 0, ed.dom.createHTML('a', {name:name, 'class':'mceItemAnchor'}, ''));
38
-
39
- tinyMCEPopup.close();
40
- }
4
+ init : function(ed) {
5
+ var action, elm, f = document.forms[0];
6
+
7
+ this.editor = ed;
8
+ elm = ed.dom.getParent(ed.selection.getNode(), 'A');
9
+ v = ed.dom.getAttrib(elm, 'name') || ed.dom.getAttrib(elm, 'id');
10
+
11
+ if (v) {
12
+ this.action = 'update';
13
+ f.anchorName.value = v;
14
+ }
15
+
16
+ f.insert.value = ed.getLang(elm ? 'update' : 'insert');
17
+ },
18
+
19
+ update : function() {
20
+ var ed = this.editor, elm, name = document.forms[0].anchorName.value, attribName;
21
+
22
+ if (!name || !/^[a-z][a-z0-9\-\_:\.]*$/i.test(name)) {
23
+ tinyMCEPopup.alert('advanced_dlg.anchor_invalid');
24
+ return;
25
+ }
26
+
27
+ tinyMCEPopup.restoreSelection();
28
+
29
+ if (this.action != 'update')
30
+ ed.selection.collapse(1);
31
+
32
+ var aRule = ed.schema.getElementRule('a');
33
+ if (!aRule || aRule.attributes.name) {
34
+ attribName = 'name';
35
+ } else {
36
+ attribName = 'id';
37
+ }
38
+
39
+ elm = ed.dom.getParent(ed.selection.getNode(), 'A');
40
+ if (elm) {
41
+ elm.setAttribute(attribName, name);
42
+ elm[attribName] = name;
43
+ ed.undoManager.add();
44
+ } else {
45
+ // create with zero-sized nbsp so that in Webkit where anchor is on last line by itself caret cannot be placed after it
46
+ var attrs = {'class' : 'mceItemAnchor'};
47
+ attrs[attribName] = name;
48
+ ed.execCommand('mceInsertContent', 0, ed.dom.createHTML('a', attrs, '\uFEFF'));
49
+ ed.nodeChanged();
50
+ }
51
+
52
+ tinyMCEPopup.close();
53
+ }
41
54
  };
42
55
 
43
56
  tinyMCEPopup.onInit.add(AnchorDialog.init, AnchorDialog);
@@ -11,353 +11,353 @@
11
11
  tinyMCEPopup.requireLangPack();
12
12
 
13
13
  var charmap = [
14
- ['&nbsp;', '&#160;', true, 'no-break space'],
15
- ['&amp;', '&#38;', true, 'ampersand'],
16
- ['&quot;', '&#34;', true, 'quotation mark'],
14
+ ['&nbsp;', '&#160;', true, 'no-break space'],
15
+ ['&amp;', '&#38;', true, 'ampersand'],
16
+ ['&quot;', '&#34;', true, 'quotation mark'],
17
17
  // finance
18
- ['&cent;', '&#162;', true, 'cent sign'],
19
- ['&euro;', '&#8364;', true, 'euro sign'],
20
- ['&pound;', '&#163;', true, 'pound sign'],
21
- ['&yen;', '&#165;', true, 'yen sign'],
18
+ ['&cent;', '&#162;', true, 'cent sign'],
19
+ ['&euro;', '&#8364;', true, 'euro sign'],
20
+ ['&pound;', '&#163;', true, 'pound sign'],
21
+ ['&yen;', '&#165;', true, 'yen sign'],
22
22
  // signs
23
- ['&copy;', '&#169;', true, 'copyright sign'],
24
- ['&reg;', '&#174;', true, 'registered sign'],
25
- ['&trade;', '&#8482;', true, 'trade mark sign'],
26
- ['&permil;', '&#8240;', true, 'per mille sign'],
27
- ['&micro;', '&#181;', true, 'micro sign'],
28
- ['&middot;', '&#183;', true, 'middle dot'],
29
- ['&bull;', '&#8226;', true, 'bullet'],
30
- ['&hellip;', '&#8230;', true, 'three dot leader'],
31
- ['&prime;', '&#8242;', true, 'minutes / feet'],
32
- ['&Prime;', '&#8243;', true, 'seconds / inches'],
33
- ['&sect;', '&#167;', true, 'section sign'],
34
- ['&para;', '&#182;', true, 'paragraph sign'],
35
- ['&szlig;', '&#223;', true, 'sharp s / ess-zed'],
23
+ ['&copy;', '&#169;', true, 'copyright sign'],
24
+ ['&reg;', '&#174;', true, 'registered sign'],
25
+ ['&trade;', '&#8482;', true, 'trade mark sign'],
26
+ ['&permil;', '&#8240;', true, 'per mille sign'],
27
+ ['&micro;', '&#181;', true, 'micro sign'],
28
+ ['&middot;', '&#183;', true, 'middle dot'],
29
+ ['&bull;', '&#8226;', true, 'bullet'],
30
+ ['&hellip;', '&#8230;', true, 'three dot leader'],
31
+ ['&prime;', '&#8242;', true, 'minutes / feet'],
32
+ ['&Prime;', '&#8243;', true, 'seconds / inches'],
33
+ ['&sect;', '&#167;', true, 'section sign'],
34
+ ['&para;', '&#182;', true, 'paragraph sign'],
35
+ ['&szlig;', '&#223;', true, 'sharp s / ess-zed'],
36
36
  // quotations
37
- ['&lsaquo;', '&#8249;', true, 'single left-pointing angle quotation mark'],
38
- ['&rsaquo;', '&#8250;', true, 'single right-pointing angle quotation mark'],
39
- ['&laquo;', '&#171;', true, 'left pointing guillemet'],
40
- ['&raquo;', '&#187;', true, 'right pointing guillemet'],
41
- ['&lsquo;', '&#8216;', true, 'left single quotation mark'],
42
- ['&rsquo;', '&#8217;', true, 'right single quotation mark'],
43
- ['&ldquo;', '&#8220;', true, 'left double quotation mark'],
44
- ['&rdquo;', '&#8221;', true, 'right double quotation mark'],
45
- ['&sbquo;', '&#8218;', true, 'single low-9 quotation mark'],
46
- ['&bdquo;', '&#8222;', true, 'double low-9 quotation mark'],
47
- ['&lt;', '&#60;', true, 'less-than sign'],
48
- ['&gt;', '&#62;', true, 'greater-than sign'],
49
- ['&le;', '&#8804;', true, 'less-than or equal to'],
50
- ['&ge;', '&#8805;', true, 'greater-than or equal to'],
51
- ['&ndash;', '&#8211;', true, 'en dash'],
52
- ['&mdash;', '&#8212;', true, 'em dash'],
53
- ['&macr;', '&#175;', true, 'macron'],
54
- ['&oline;', '&#8254;', true, 'overline'],
55
- ['&curren;', '&#164;', true, 'currency sign'],
56
- ['&brvbar;', '&#166;', true, 'broken bar'],
57
- ['&uml;', '&#168;', true, 'diaeresis'],
58
- ['&iexcl;', '&#161;', true, 'inverted exclamation mark'],
59
- ['&iquest;', '&#191;', true, 'turned question mark'],
60
- ['&circ;', '&#710;', true, 'circumflex accent'],
61
- ['&tilde;', '&#732;', true, 'small tilde'],
62
- ['&deg;', '&#176;', true, 'degree sign'],
63
- ['&minus;', '&#8722;', true, 'minus sign'],
64
- ['&plusmn;', '&#177;', true, 'plus-minus sign'],
65
- ['&divide;', '&#247;', true, 'division sign'],
66
- ['&frasl;', '&#8260;', true, 'fraction slash'],
67
- ['&times;', '&#215;', true, 'multiplication sign'],
68
- ['&sup1;', '&#185;', true, 'superscript one'],
69
- ['&sup2;', '&#178;', true, 'superscript two'],
70
- ['&sup3;', '&#179;', true, 'superscript three'],
71
- ['&frac14;', '&#188;', true, 'fraction one quarter'],
72
- ['&frac12;', '&#189;', true, 'fraction one half'],
73
- ['&frac34;', '&#190;', true, 'fraction three quarters'],
37
+ ['&lsaquo;', '&#8249;', true, 'single left-pointing angle quotation mark'],
38
+ ['&rsaquo;', '&#8250;', true, 'single right-pointing angle quotation mark'],
39
+ ['&laquo;', '&#171;', true, 'left pointing guillemet'],
40
+ ['&raquo;', '&#187;', true, 'right pointing guillemet'],
41
+ ['&lsquo;', '&#8216;', true, 'left single quotation mark'],
42
+ ['&rsquo;', '&#8217;', true, 'right single quotation mark'],
43
+ ['&ldquo;', '&#8220;', true, 'left double quotation mark'],
44
+ ['&rdquo;', '&#8221;', true, 'right double quotation mark'],
45
+ ['&sbquo;', '&#8218;', true, 'single low-9 quotation mark'],
46
+ ['&bdquo;', '&#8222;', true, 'double low-9 quotation mark'],
47
+ ['&lt;', '&#60;', true, 'less-than sign'],
48
+ ['&gt;', '&#62;', true, 'greater-than sign'],
49
+ ['&le;', '&#8804;', true, 'less-than or equal to'],
50
+ ['&ge;', '&#8805;', true, 'greater-than or equal to'],
51
+ ['&ndash;', '&#8211;', true, 'en dash'],
52
+ ['&mdash;', '&#8212;', true, 'em dash'],
53
+ ['&macr;', '&#175;', true, 'macron'],
54
+ ['&oline;', '&#8254;', true, 'overline'],
55
+ ['&curren;', '&#164;', true, 'currency sign'],
56
+ ['&brvbar;', '&#166;', true, 'broken bar'],
57
+ ['&uml;', '&#168;', true, 'diaeresis'],
58
+ ['&iexcl;', '&#161;', true, 'inverted exclamation mark'],
59
+ ['&iquest;', '&#191;', true, 'turned question mark'],
60
+ ['&circ;', '&#710;', true, 'circumflex accent'],
61
+ ['&tilde;', '&#732;', true, 'small tilde'],
62
+ ['&deg;', '&#176;', true, 'degree sign'],
63
+ ['&minus;', '&#8722;', true, 'minus sign'],
64
+ ['&plusmn;', '&#177;', true, 'plus-minus sign'],
65
+ ['&divide;', '&#247;', true, 'division sign'],
66
+ ['&frasl;', '&#8260;', true, 'fraction slash'],
67
+ ['&times;', '&#215;', true, 'multiplication sign'],
68
+ ['&sup1;', '&#185;', true, 'superscript one'],
69
+ ['&sup2;', '&#178;', true, 'superscript two'],
70
+ ['&sup3;', '&#179;', true, 'superscript three'],
71
+ ['&frac14;', '&#188;', true, 'fraction one quarter'],
72
+ ['&frac12;', '&#189;', true, 'fraction one half'],
73
+ ['&frac34;', '&#190;', true, 'fraction three quarters'],
74
74
  // math / logical
75
- ['&fnof;', '&#402;', true, 'function / florin'],
76
- ['&int;', '&#8747;', true, 'integral'],
77
- ['&sum;', '&#8721;', true, 'n-ary sumation'],
78
- ['&infin;', '&#8734;', true, 'infinity'],
79
- ['&radic;', '&#8730;', true, 'square root'],
80
- ['&sim;', '&#8764;', false, 'similar to'],
81
- ['&cong;', '&#8773;', false, 'approximately equal to'],
82
- ['&asymp;', '&#8776;', true, 'almost equal to'],
83
- ['&ne;', '&#8800;', true, 'not equal to'],
84
- ['&equiv;', '&#8801;', true, 'identical to'],
85
- ['&isin;', '&#8712;', false, 'element of'],
86
- ['&notin;', '&#8713;', false, 'not an element of'],
87
- ['&ni;', '&#8715;', false, 'contains as member'],
88
- ['&prod;', '&#8719;', true, 'n-ary product'],
89
- ['&and;', '&#8743;', false, 'logical and'],
90
- ['&or;', '&#8744;', false, 'logical or'],
91
- ['&not;', '&#172;', true, 'not sign'],
92
- ['&cap;', '&#8745;', true, 'intersection'],
93
- ['&cup;', '&#8746;', false, 'union'],
94
- ['&part;', '&#8706;', true, 'partial differential'],
95
- ['&forall;', '&#8704;', false, 'for all'],
96
- ['&exist;', '&#8707;', false, 'there exists'],
97
- ['&empty;', '&#8709;', false, 'diameter'],
98
- ['&nabla;', '&#8711;', false, 'backward difference'],
99
- ['&lowast;', '&#8727;', false, 'asterisk operator'],
100
- ['&prop;', '&#8733;', false, 'proportional to'],
101
- ['&ang;', '&#8736;', false, 'angle'],
75
+ ['&fnof;', '&#402;', true, 'function / florin'],
76
+ ['&int;', '&#8747;', true, 'integral'],
77
+ ['&sum;', '&#8721;', true, 'n-ary sumation'],
78
+ ['&infin;', '&#8734;', true, 'infinity'],
79
+ ['&radic;', '&#8730;', true, 'square root'],
80
+ ['&sim;', '&#8764;', false,'similar to'],
81
+ ['&cong;', '&#8773;', false,'approximately equal to'],
82
+ ['&asymp;', '&#8776;', true, 'almost equal to'],
83
+ ['&ne;', '&#8800;', true, 'not equal to'],
84
+ ['&equiv;', '&#8801;', true, 'identical to'],
85
+ ['&isin;', '&#8712;', false,'element of'],
86
+ ['&notin;', '&#8713;', false,'not an element of'],
87
+ ['&ni;', '&#8715;', false,'contains as member'],
88
+ ['&prod;', '&#8719;', true, 'n-ary product'],
89
+ ['&and;', '&#8743;', false,'logical and'],
90
+ ['&or;', '&#8744;', false,'logical or'],
91
+ ['&not;', '&#172;', true, 'not sign'],
92
+ ['&cap;', '&#8745;', true, 'intersection'],
93
+ ['&cup;', '&#8746;', false,'union'],
94
+ ['&part;', '&#8706;', true, 'partial differential'],
95
+ ['&forall;', '&#8704;', false,'for all'],
96
+ ['&exist;', '&#8707;', false,'there exists'],
97
+ ['&empty;', '&#8709;', false,'diameter'],
98
+ ['&nabla;', '&#8711;', false,'backward difference'],
99
+ ['&lowast;', '&#8727;', false,'asterisk operator'],
100
+ ['&prop;', '&#8733;', false,'proportional to'],
101
+ ['&ang;', '&#8736;', false,'angle'],
102
102
  // undefined
103
- ['&acute;', '&#180;', true, 'acute accent'],
104
- ['&cedil;', '&#184;', true, 'cedilla'],
105
- ['&ordf;', '&#170;', true, 'feminine ordinal indicator'],
106
- ['&ordm;', '&#186;', true, 'masculine ordinal indicator'],
107
- ['&dagger;', '&#8224;', true, 'dagger'],
108
- ['&Dagger;', '&#8225;', true, 'double dagger'],
103
+ ['&acute;', '&#180;', true, 'acute accent'],
104
+ ['&cedil;', '&#184;', true, 'cedilla'],
105
+ ['&ordf;', '&#170;', true, 'feminine ordinal indicator'],
106
+ ['&ordm;', '&#186;', true, 'masculine ordinal indicator'],
107
+ ['&dagger;', '&#8224;', true, 'dagger'],
108
+ ['&Dagger;', '&#8225;', true, 'double dagger'],
109
109
  // alphabetical special chars
110
- ['&Agrave;', '&#192;', true, 'A - grave'],
111
- ['&Aacute;', '&#193;', true, 'A - acute'],
112
- ['&Acirc;', '&#194;', true, 'A - circumflex'],
113
- ['&Atilde;', '&#195;', true, 'A - tilde'],
114
- ['&Auml;', '&#196;', true, 'A - diaeresis'],
115
- ['&Aring;', '&#197;', true, 'A - ring above'],
116
- ['&AElig;', '&#198;', true, 'ligature AE'],
117
- ['&Ccedil;', '&#199;', true, 'C - cedilla'],
118
- ['&Egrave;', '&#200;', true, 'E - grave'],
119
- ['&Eacute;', '&#201;', true, 'E - acute'],
120
- ['&Ecirc;', '&#202;', true, 'E - circumflex'],
121
- ['&Euml;', '&#203;', true, 'E - diaeresis'],
122
- ['&Igrave;', '&#204;', true, 'I - grave'],
123
- ['&Iacute;', '&#205;', true, 'I - acute'],
124
- ['&Icirc;', '&#206;', true, 'I - circumflex'],
125
- ['&Iuml;', '&#207;', true, 'I - diaeresis'],
126
- ['&ETH;', '&#208;', true, 'ETH'],
127
- ['&Ntilde;', '&#209;', true, 'N - tilde'],
128
- ['&Ograve;', '&#210;', true, 'O - grave'],
129
- ['&Oacute;', '&#211;', true, 'O - acute'],
130
- ['&Ocirc;', '&#212;', true, 'O - circumflex'],
131
- ['&Otilde;', '&#213;', true, 'O - tilde'],
132
- ['&Ouml;', '&#214;', true, 'O - diaeresis'],
133
- ['&Oslash;', '&#216;', true, 'O - slash'],
134
- ['&OElig;', '&#338;', true, 'ligature OE'],
135
- ['&Scaron;', '&#352;', true, 'S - caron'],
136
- ['&Ugrave;', '&#217;', true, 'U - grave'],
137
- ['&Uacute;', '&#218;', true, 'U - acute'],
138
- ['&Ucirc;', '&#219;', true, 'U - circumflex'],
139
- ['&Uuml;', '&#220;', true, 'U - diaeresis'],
140
- ['&Yacute;', '&#221;', true, 'Y - acute'],
141
- ['&Yuml;', '&#376;', true, 'Y - diaeresis'],
142
- ['&THORN;', '&#222;', true, 'THORN'],
143
- ['&agrave;', '&#224;', true, 'a - grave'],
144
- ['&aacute;', '&#225;', true, 'a - acute'],
145
- ['&acirc;', '&#226;', true, 'a - circumflex'],
146
- ['&atilde;', '&#227;', true, 'a - tilde'],
147
- ['&auml;', '&#228;', true, 'a - diaeresis'],
148
- ['&aring;', '&#229;', true, 'a - ring above'],
149
- ['&aelig;', '&#230;', true, 'ligature ae'],
150
- ['&ccedil;', '&#231;', true, 'c - cedilla'],
151
- ['&egrave;', '&#232;', true, 'e - grave'],
152
- ['&eacute;', '&#233;', true, 'e - acute'],
153
- ['&ecirc;', '&#234;', true, 'e - circumflex'],
154
- ['&euml;', '&#235;', true, 'e - diaeresis'],
155
- ['&igrave;', '&#236;', true, 'i - grave'],
156
- ['&iacute;', '&#237;', true, 'i - acute'],
157
- ['&icirc;', '&#238;', true, 'i - circumflex'],
158
- ['&iuml;', '&#239;', true, 'i - diaeresis'],
159
- ['&eth;', '&#240;', true, 'eth'],
160
- ['&ntilde;', '&#241;', true, 'n - tilde'],
161
- ['&ograve;', '&#242;', true, 'o - grave'],
162
- ['&oacute;', '&#243;', true, 'o - acute'],
163
- ['&ocirc;', '&#244;', true, 'o - circumflex'],
164
- ['&otilde;', '&#245;', true, 'o - tilde'],
165
- ['&ouml;', '&#246;', true, 'o - diaeresis'],
166
- ['&oslash;', '&#248;', true, 'o slash'],
167
- ['&oelig;', '&#339;', true, 'ligature oe'],
168
- ['&scaron;', '&#353;', true, 's - caron'],
169
- ['&ugrave;', '&#249;', true, 'u - grave'],
170
- ['&uacute;', '&#250;', true, 'u - acute'],
171
- ['&ucirc;', '&#251;', true, 'u - circumflex'],
172
- ['&uuml;', '&#252;', true, 'u - diaeresis'],
173
- ['&yacute;', '&#253;', true, 'y - acute'],
174
- ['&thorn;', '&#254;', true, 'thorn'],
175
- ['&yuml;', '&#255;', true, 'y - diaeresis'],
176
- ['&Alpha;', '&#913;', true, 'Alpha'],
177
- ['&Beta;', '&#914;', true, 'Beta'],
178
- ['&Gamma;', '&#915;', true, 'Gamma'],
179
- ['&Delta;', '&#916;', true, 'Delta'],
180
- ['&Epsilon;', '&#917;', true, 'Epsilon'],
181
- ['&Zeta;', '&#918;', true, 'Zeta'],
182
- ['&Eta;', '&#919;', true, 'Eta'],
183
- ['&Theta;', '&#920;', true, 'Theta'],
184
- ['&Iota;', '&#921;', true, 'Iota'],
185
- ['&Kappa;', '&#922;', true, 'Kappa'],
186
- ['&Lambda;', '&#923;', true, 'Lambda'],
187
- ['&Mu;', '&#924;', true, 'Mu'],
188
- ['&Nu;', '&#925;', true, 'Nu'],
189
- ['&Xi;', '&#926;', true, 'Xi'],
190
- ['&Omicron;', '&#927;', true, 'Omicron'],
191
- ['&Pi;', '&#928;', true, 'Pi'],
192
- ['&Rho;', '&#929;', true, 'Rho'],
193
- ['&Sigma;', '&#931;', true, 'Sigma'],
194
- ['&Tau;', '&#932;', true, 'Tau'],
195
- ['&Upsilon;', '&#933;', true, 'Upsilon'],
196
- ['&Phi;', '&#934;', true, 'Phi'],
197
- ['&Chi;', '&#935;', true, 'Chi'],
198
- ['&Psi;', '&#936;', true, 'Psi'],
199
- ['&Omega;', '&#937;', true, 'Omega'],
200
- ['&alpha;', '&#945;', true, 'alpha'],
201
- ['&beta;', '&#946;', true, 'beta'],
202
- ['&gamma;', '&#947;', true, 'gamma'],
203
- ['&delta;', '&#948;', true, 'delta'],
204
- ['&epsilon;', '&#949;', true, 'epsilon'],
205
- ['&zeta;', '&#950;', true, 'zeta'],
206
- ['&eta;', '&#951;', true, 'eta'],
207
- ['&theta;', '&#952;', true, 'theta'],
208
- ['&iota;', '&#953;', true, 'iota'],
209
- ['&kappa;', '&#954;', true, 'kappa'],
210
- ['&lambda;', '&#955;', true, 'lambda'],
211
- ['&mu;', '&#956;', true, 'mu'],
212
- ['&nu;', '&#957;', true, 'nu'],
213
- ['&xi;', '&#958;', true, 'xi'],
214
- ['&omicron;', '&#959;', true, 'omicron'],
215
- ['&pi;', '&#960;', true, 'pi'],
216
- ['&rho;', '&#961;', true, 'rho'],
217
- ['&sigmaf;', '&#962;', true, 'final sigma'],
218
- ['&sigma;', '&#963;', true, 'sigma'],
219
- ['&tau;', '&#964;', true, 'tau'],
220
- ['&upsilon;', '&#965;', true, 'upsilon'],
221
- ['&phi;', '&#966;', true, 'phi'],
222
- ['&chi;', '&#967;', true, 'chi'],
223
- ['&psi;', '&#968;', true, 'psi'],
224
- ['&omega;', '&#969;', true, 'omega'],
110
+ ['&Agrave;', '&#192;', true, 'A - grave'],
111
+ ['&Aacute;', '&#193;', true, 'A - acute'],
112
+ ['&Acirc;', '&#194;', true, 'A - circumflex'],
113
+ ['&Atilde;', '&#195;', true, 'A - tilde'],
114
+ ['&Auml;', '&#196;', true, 'A - diaeresis'],
115
+ ['&Aring;', '&#197;', true, 'A - ring above'],
116
+ ['&AElig;', '&#198;', true, 'ligature AE'],
117
+ ['&Ccedil;', '&#199;', true, 'C - cedilla'],
118
+ ['&Egrave;', '&#200;', true, 'E - grave'],
119
+ ['&Eacute;', '&#201;', true, 'E - acute'],
120
+ ['&Ecirc;', '&#202;', true, 'E - circumflex'],
121
+ ['&Euml;', '&#203;', true, 'E - diaeresis'],
122
+ ['&Igrave;', '&#204;', true, 'I - grave'],
123
+ ['&Iacute;', '&#205;', true, 'I - acute'],
124
+ ['&Icirc;', '&#206;', true, 'I - circumflex'],
125
+ ['&Iuml;', '&#207;', true, 'I - diaeresis'],
126
+ ['&ETH;', '&#208;', true, 'ETH'],
127
+ ['&Ntilde;', '&#209;', true, 'N - tilde'],
128
+ ['&Ograve;', '&#210;', true, 'O - grave'],
129
+ ['&Oacute;', '&#211;', true, 'O - acute'],
130
+ ['&Ocirc;', '&#212;', true, 'O - circumflex'],
131
+ ['&Otilde;', '&#213;', true, 'O - tilde'],
132
+ ['&Ouml;', '&#214;', true, 'O - diaeresis'],
133
+ ['&Oslash;', '&#216;', true, 'O - slash'],
134
+ ['&OElig;', '&#338;', true, 'ligature OE'],
135
+ ['&Scaron;', '&#352;', true, 'S - caron'],
136
+ ['&Ugrave;', '&#217;', true, 'U - grave'],
137
+ ['&Uacute;', '&#218;', true, 'U - acute'],
138
+ ['&Ucirc;', '&#219;', true, 'U - circumflex'],
139
+ ['&Uuml;', '&#220;', true, 'U - diaeresis'],
140
+ ['&Yacute;', '&#221;', true, 'Y - acute'],
141
+ ['&Yuml;', '&#376;', true, 'Y - diaeresis'],
142
+ ['&THORN;', '&#222;', true, 'THORN'],
143
+ ['&agrave;', '&#224;', true, 'a - grave'],
144
+ ['&aacute;', '&#225;', true, 'a - acute'],
145
+ ['&acirc;', '&#226;', true, 'a - circumflex'],
146
+ ['&atilde;', '&#227;', true, 'a - tilde'],
147
+ ['&auml;', '&#228;', true, 'a - diaeresis'],
148
+ ['&aring;', '&#229;', true, 'a - ring above'],
149
+ ['&aelig;', '&#230;', true, 'ligature ae'],
150
+ ['&ccedil;', '&#231;', true, 'c - cedilla'],
151
+ ['&egrave;', '&#232;', true, 'e - grave'],
152
+ ['&eacute;', '&#233;', true, 'e - acute'],
153
+ ['&ecirc;', '&#234;', true, 'e - circumflex'],
154
+ ['&euml;', '&#235;', true, 'e - diaeresis'],
155
+ ['&igrave;', '&#236;', true, 'i - grave'],
156
+ ['&iacute;', '&#237;', true, 'i - acute'],
157
+ ['&icirc;', '&#238;', true, 'i - circumflex'],
158
+ ['&iuml;', '&#239;', true, 'i - diaeresis'],
159
+ ['&eth;', '&#240;', true, 'eth'],
160
+ ['&ntilde;', '&#241;', true, 'n - tilde'],
161
+ ['&ograve;', '&#242;', true, 'o - grave'],
162
+ ['&oacute;', '&#243;', true, 'o - acute'],
163
+ ['&ocirc;', '&#244;', true, 'o - circumflex'],
164
+ ['&otilde;', '&#245;', true, 'o - tilde'],
165
+ ['&ouml;', '&#246;', true, 'o - diaeresis'],
166
+ ['&oslash;', '&#248;', true, 'o slash'],
167
+ ['&oelig;', '&#339;', true, 'ligature oe'],
168
+ ['&scaron;', '&#353;', true, 's - caron'],
169
+ ['&ugrave;', '&#249;', true, 'u - grave'],
170
+ ['&uacute;', '&#250;', true, 'u - acute'],
171
+ ['&ucirc;', '&#251;', true, 'u - circumflex'],
172
+ ['&uuml;', '&#252;', true, 'u - diaeresis'],
173
+ ['&yacute;', '&#253;', true, 'y - acute'],
174
+ ['&thorn;', '&#254;', true, 'thorn'],
175
+ ['&yuml;', '&#255;', true, 'y - diaeresis'],
176
+ ['&Alpha;', '&#913;', true, 'Alpha'],
177
+ ['&Beta;', '&#914;', true, 'Beta'],
178
+ ['&Gamma;', '&#915;', true, 'Gamma'],
179
+ ['&Delta;', '&#916;', true, 'Delta'],
180
+ ['&Epsilon;', '&#917;', true, 'Epsilon'],
181
+ ['&Zeta;', '&#918;', true, 'Zeta'],
182
+ ['&Eta;', '&#919;', true, 'Eta'],
183
+ ['&Theta;', '&#920;', true, 'Theta'],
184
+ ['&Iota;', '&#921;', true, 'Iota'],
185
+ ['&Kappa;', '&#922;', true, 'Kappa'],
186
+ ['&Lambda;', '&#923;', true, 'Lambda'],
187
+ ['&Mu;', '&#924;', true, 'Mu'],
188
+ ['&Nu;', '&#925;', true, 'Nu'],
189
+ ['&Xi;', '&#926;', true, 'Xi'],
190
+ ['&Omicron;', '&#927;', true, 'Omicron'],
191
+ ['&Pi;', '&#928;', true, 'Pi'],
192
+ ['&Rho;', '&#929;', true, 'Rho'],
193
+ ['&Sigma;', '&#931;', true, 'Sigma'],
194
+ ['&Tau;', '&#932;', true, 'Tau'],
195
+ ['&Upsilon;', '&#933;', true, 'Upsilon'],
196
+ ['&Phi;', '&#934;', true, 'Phi'],
197
+ ['&Chi;', '&#935;', true, 'Chi'],
198
+ ['&Psi;', '&#936;', true, 'Psi'],
199
+ ['&Omega;', '&#937;', true, 'Omega'],
200
+ ['&alpha;', '&#945;', true, 'alpha'],
201
+ ['&beta;', '&#946;', true, 'beta'],
202
+ ['&gamma;', '&#947;', true, 'gamma'],
203
+ ['&delta;', '&#948;', true, 'delta'],
204
+ ['&epsilon;', '&#949;', true, 'epsilon'],
205
+ ['&zeta;', '&#950;', true, 'zeta'],
206
+ ['&eta;', '&#951;', true, 'eta'],
207
+ ['&theta;', '&#952;', true, 'theta'],
208
+ ['&iota;', '&#953;', true, 'iota'],
209
+ ['&kappa;', '&#954;', true, 'kappa'],
210
+ ['&lambda;', '&#955;', true, 'lambda'],
211
+ ['&mu;', '&#956;', true, 'mu'],
212
+ ['&nu;', '&#957;', true, 'nu'],
213
+ ['&xi;', '&#958;', true, 'xi'],
214
+ ['&omicron;', '&#959;', true, 'omicron'],
215
+ ['&pi;', '&#960;', true, 'pi'],
216
+ ['&rho;', '&#961;', true, 'rho'],
217
+ ['&sigmaf;', '&#962;', true, 'final sigma'],
218
+ ['&sigma;', '&#963;', true, 'sigma'],
219
+ ['&tau;', '&#964;', true, 'tau'],
220
+ ['&upsilon;', '&#965;', true, 'upsilon'],
221
+ ['&phi;', '&#966;', true, 'phi'],
222
+ ['&chi;', '&#967;', true, 'chi'],
223
+ ['&psi;', '&#968;', true, 'psi'],
224
+ ['&omega;', '&#969;', true, 'omega'],
225
225
  // symbols
226
- ['&alefsym;', '&#8501;', false, 'alef symbol'],
227
- ['&piv;', '&#982;', false, 'pi symbol'],
228
- ['&real;', '&#8476;', false, 'real part symbol'],
229
- ['&thetasym;', '&#977;', false, 'theta symbol'],
230
- ['&upsih;', '&#978;', false, 'upsilon - hook symbol'],
231
- ['&weierp;', '&#8472;', false, 'Weierstrass p'],
232
- ['&image;', '&#8465;', false, 'imaginary part'],
226
+ ['&alefsym;', '&#8501;', false,'alef symbol'],
227
+ ['&piv;', '&#982;', false,'pi symbol'],
228
+ ['&real;', '&#8476;', false,'real part symbol'],
229
+ ['&thetasym;','&#977;', false,'theta symbol'],
230
+ ['&upsih;', '&#978;', false,'upsilon - hook symbol'],
231
+ ['&weierp;', '&#8472;', false,'Weierstrass p'],
232
+ ['&image;', '&#8465;', false,'imaginary part'],
233
233
  // arrows
234
- ['&larr;', '&#8592;', true, 'leftwards arrow'],
235
- ['&uarr;', '&#8593;', true, 'upwards arrow'],
236
- ['&rarr;', '&#8594;', true, 'rightwards arrow'],
237
- ['&darr;', '&#8595;', true, 'downwards arrow'],
238
- ['&harr;', '&#8596;', true, 'left right arrow'],
239
- ['&crarr;', '&#8629;', false, 'carriage return'],
240
- ['&lArr;', '&#8656;', false, 'leftwards double arrow'],
241
- ['&uArr;', '&#8657;', false, 'upwards double arrow'],
242
- ['&rArr;', '&#8658;', false, 'rightwards double arrow'],
243
- ['&dArr;', '&#8659;', false, 'downwards double arrow'],
244
- ['&hArr;', '&#8660;', false, 'left right double arrow'],
245
- ['&there4;', '&#8756;', false, 'therefore'],
246
- ['&sub;', '&#8834;', false, 'subset of'],
247
- ['&sup;', '&#8835;', false, 'superset of'],
248
- ['&nsub;', '&#8836;', false, 'not a subset of'],
249
- ['&sube;', '&#8838;', false, 'subset of or equal to'],
250
- ['&supe;', '&#8839;', false, 'superset of or equal to'],
251
- ['&oplus;', '&#8853;', false, 'circled plus'],
252
- ['&otimes;', '&#8855;', false, 'circled times'],
253
- ['&perp;', '&#8869;', false, 'perpendicular'],
254
- ['&sdot;', '&#8901;', false, 'dot operator'],
255
- ['&lceil;', '&#8968;', false, 'left ceiling'],
256
- ['&rceil;', '&#8969;', false, 'right ceiling'],
257
- ['&lfloor;', '&#8970;', false, 'left floor'],
258
- ['&rfloor;', '&#8971;', false, 'right floor'],
259
- ['&lang;', '&#9001;', false, 'left-pointing angle bracket'],
260
- ['&rang;', '&#9002;', false, 'right-pointing angle bracket'],
261
- ['&loz;', '&#9674;', true, 'lozenge'],
262
- ['&spades;', '&#9824;', true, 'black spade suit'],
263
- ['&clubs;', '&#9827;', true, 'black club suit'],
264
- ['&hearts;', '&#9829;', true, 'black heart suit'],
265
- ['&diams;', '&#9830;', true, 'black diamond suit'],
266
- ['&ensp;', '&#8194;', false, 'en space'],
267
- ['&emsp;', '&#8195;', false, 'em space'],
268
- ['&thinsp;', '&#8201;', false, 'thin space'],
269
- ['&zwnj;', '&#8204;', false, 'zero width non-joiner'],
270
- ['&zwj;', '&#8205;', false, 'zero width joiner'],
271
- ['&lrm;', '&#8206;', false, 'left-to-right mark'],
272
- ['&rlm;', '&#8207;', false, 'right-to-left mark'],
273
- ['&shy;', '&#173;', false, 'soft hyphen']
234
+ ['&larr;', '&#8592;', true, 'leftwards arrow'],
235
+ ['&uarr;', '&#8593;', true, 'upwards arrow'],
236
+ ['&rarr;', '&#8594;', true, 'rightwards arrow'],
237
+ ['&darr;', '&#8595;', true, 'downwards arrow'],
238
+ ['&harr;', '&#8596;', true, 'left right arrow'],
239
+ ['&crarr;', '&#8629;', false,'carriage return'],
240
+ ['&lArr;', '&#8656;', false,'leftwards double arrow'],
241
+ ['&uArr;', '&#8657;', false,'upwards double arrow'],
242
+ ['&rArr;', '&#8658;', false,'rightwards double arrow'],
243
+ ['&dArr;', '&#8659;', false,'downwards double arrow'],
244
+ ['&hArr;', '&#8660;', false,'left right double arrow'],
245
+ ['&there4;', '&#8756;', false,'therefore'],
246
+ ['&sub;', '&#8834;', false,'subset of'],
247
+ ['&sup;', '&#8835;', false,'superset of'],
248
+ ['&nsub;', '&#8836;', false,'not a subset of'],
249
+ ['&sube;', '&#8838;', false,'subset of or equal to'],
250
+ ['&supe;', '&#8839;', false,'superset of or equal to'],
251
+ ['&oplus;', '&#8853;', false,'circled plus'],
252
+ ['&otimes;', '&#8855;', false,'circled times'],
253
+ ['&perp;', '&#8869;', false,'perpendicular'],
254
+ ['&sdot;', '&#8901;', false,'dot operator'],
255
+ ['&lceil;', '&#8968;', false,'left ceiling'],
256
+ ['&rceil;', '&#8969;', false,'right ceiling'],
257
+ ['&lfloor;', '&#8970;', false,'left floor'],
258
+ ['&rfloor;', '&#8971;', false,'right floor'],
259
+ ['&lang;', '&#9001;', false,'left-pointing angle bracket'],
260
+ ['&rang;', '&#9002;', false,'right-pointing angle bracket'],
261
+ ['&loz;', '&#9674;', true, 'lozenge'],
262
+ ['&spades;', '&#9824;', true, 'black spade suit'],
263
+ ['&clubs;', '&#9827;', true, 'black club suit'],
264
+ ['&hearts;', '&#9829;', true, 'black heart suit'],
265
+ ['&diams;', '&#9830;', true, 'black diamond suit'],
266
+ ['&ensp;', '&#8194;', false,'en space'],
267
+ ['&emsp;', '&#8195;', false,'em space'],
268
+ ['&thinsp;', '&#8201;', false,'thin space'],
269
+ ['&zwnj;', '&#8204;', false,'zero width non-joiner'],
270
+ ['&zwj;', '&#8205;', false,'zero width joiner'],
271
+ ['&lrm;', '&#8206;', false,'left-to-right mark'],
272
+ ['&rlm;', '&#8207;', false,'right-to-left mark'],
273
+ ['&shy;', '&#173;', false,'soft hyphen']
274
274
  ];
275
275
 
276
- tinyMCEPopup.onInit.add(function () {
277
- tinyMCEPopup.dom.setHTML('charmapView', renderCharMapHTML());
278
- addKeyboardNavigation();
276
+ tinyMCEPopup.onInit.add(function() {
277
+ tinyMCEPopup.dom.setHTML('charmapView', renderCharMapHTML());
278
+ addKeyboardNavigation();
279
279
  });
280
280
 
281
- function addKeyboardNavigation() {
282
- var tableElm, cells, settings;
281
+ function addKeyboardNavigation(){
282
+ var tableElm, cells, settings;
283
283
 
284
- cells = tinyMCEPopup.dom.select("a.charmaplink", "charmapgroup");
284
+ cells = tinyMCEPopup.dom.select("a.charmaplink", "charmapgroup");
285
285
 
286
- settings = {
287
- root:"charmapgroup",
288
- items:cells
289
- };
290
- cells[0].tabindex = 0;
291
- tinyMCEPopup.dom.addClass(cells[0], "mceFocus");
292
- if (tinymce.isGecko) {
293
- cells[0].focus();
294
- } else {
295
- setTimeout(function () {
296
- cells[0].focus();
297
- }, 100);
298
- }
299
- tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', settings, tinyMCEPopup.dom);
286
+ settings ={
287
+ root: "charmapgroup",
288
+ items: cells
289
+ };
290
+ cells[0].tabindex=0;
291
+ tinyMCEPopup.dom.addClass(cells[0], "mceFocus");
292
+ if (tinymce.isGecko) {
293
+ cells[0].focus();
294
+ } else {
295
+ setTimeout(function(){
296
+ cells[0].focus();
297
+ }, 100);
298
+ }
299
+ tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', settings, tinyMCEPopup.dom);
300
300
  }
301
301
 
302
302
  function renderCharMapHTML() {
303
- var charsPerRow = 20, tdWidth = 20, tdHeight = 20, i;
304
- var html = '<div id="charmapgroup" aria-labelledby="charmap_label" tabindex="0" role="listbox">' +
305
- '<table role="presentation" border="0" cellspacing="1" cellpadding="0" width="' + (tdWidth * charsPerRow) +
306
- '"><tr height="' + tdHeight + '">';
307
- var cols = -1;
303
+ var charsPerRow = 20, tdWidth=20, tdHeight=20, i;
304
+ var html = '<div id="charmapgroup" aria-labelledby="charmap_label" tabindex="0" role="listbox">'+
305
+ '<table role="presentation" border="0" cellspacing="1" cellpadding="0" width="' + (tdWidth*charsPerRow) +
306
+ '"><tr height="' + tdHeight + '">';
307
+ var cols=-1;
308
308
 
309
- for (i = 0; i < charmap.length; i++) {
310
- var previewCharFn;
309
+ for (i=0; i<charmap.length; i++) {
310
+ var previewCharFn;
311
311
 
312
- if (charmap[i][2] == true) {
313
- cols++;
314
- previewCharFn = 'previewChar(\'' + charmap[i][1].substring(1, charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1, charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');';
315
- html += ''
316
- + '<td class="charmap">'
317
- + '<a class="charmaplink" role="button" onmouseover="' + previewCharFn + '" onfocus="' + previewCharFn + '" href="javascript:void(0)" onclick="insertChar(\'' + charmap[i][1].substring(2, charmap[i][1].length - 1) + '\');" onclick="return false;" onmousedown="return false;" title="' + charmap[i][3] + ' ' + tinyMCEPopup.editor.translate("advanced_dlg.charmap_usage") + '">'
318
- + charmap[i][1]
319
- + '</a></td>';
320
- if ((cols + 1) % charsPerRow == 0)
321
- html += '</tr><tr height="' + tdHeight + '">';
322
- }
323
- }
312
+ if (charmap[i][2]==true) {
313
+ cols++;
314
+ previewCharFn = 'previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');';
315
+ html += ''
316
+ + '<td class="charmap">'
317
+ + '<a class="charmaplink" role="button" onmouseover="'+previewCharFn+'" onfocus="'+previewCharFn+'" href="javascript:void(0)" onclick="insertChar(\'' + charmap[i][1].substring(2,charmap[i][1].length-1) + '\');" onclick="return false;" onmousedown="return false;" title="' + charmap[i][3] + ' '+ tinyMCEPopup.editor.translate("advanced_dlg.charmap_usage")+'">'
318
+ + charmap[i][1]
319
+ + '</a></td>';
320
+ if ((cols+1) % charsPerRow == 0)
321
+ html += '</tr><tr height="' + tdHeight + '">';
322
+ }
323
+ }
324
324
 
325
- if (cols % charsPerRow > 0) {
326
- var padd = charsPerRow - (cols % charsPerRow);
327
- for (var i = 0; i < padd - 1; i++)
328
- html += '<td width="' + tdWidth + '" height="' + tdHeight + '" class="charmap">&nbsp;</td>';
329
- }
325
+ if (cols % charsPerRow > 0) {
326
+ var padd = charsPerRow - (cols % charsPerRow);
327
+ for (var i=0; i<padd-1; i++)
328
+ html += '<td width="' + tdWidth + '" height="' + tdHeight + '" class="charmap">&nbsp;</td>';
329
+ }
330
330
 
331
- html += '</tr></table></div>';
332
- html = html.replace(/<tr height="20"><\/tr>/g, '');
331
+ html += '</tr></table></div>';
332
+ html = html.replace(/<tr height="20"><\/tr>/g, '');
333
333
 
334
- return html;
334
+ return html;
335
335
  }
336
336
 
337
337
  function insertChar(chr) {
338
- tinyMCEPopup.execCommand('mceInsertContent', false, '&#' + chr + ';');
338
+ tinyMCEPopup.execCommand('mceInsertContent', false, '&#' + chr + ';');
339
339
 
340
- // Refocus in window
341
- if (tinyMCEPopup.isWindow)
342
- window.focus();
340
+ // Refocus in window
341
+ if (tinyMCEPopup.isWindow)
342
+ window.focus();
343
343
 
344
- tinyMCEPopup.editor.focus();
345
- tinyMCEPopup.close();
344
+ tinyMCEPopup.editor.focus();
345
+ tinyMCEPopup.close();
346
346
  }
347
347
 
348
348
  function previewChar(codeA, codeB, codeN) {
349
- var elmA = document.getElementById('codeA');
350
- var elmB = document.getElementById('codeB');
351
- var elmV = document.getElementById('codeV');
352
- var elmN = document.getElementById('codeN');
349
+ var elmA = document.getElementById('codeA');
350
+ var elmB = document.getElementById('codeB');
351
+ var elmV = document.getElementById('codeV');
352
+ var elmN = document.getElementById('codeN');
353
353
 
354
- if (codeA == '#160;') {
355
- elmV.innerHTML = '__';
356
- } else {
357
- elmV.innerHTML = '&' + codeA;
358
- }
354
+ if (codeA=='#160;') {
355
+ elmV.innerHTML = '__';
356
+ } else {
357
+ elmV.innerHTML = '&' + codeA;
358
+ }
359
359
 
360
- elmB.innerHTML = '&amp;' + codeA;
361
- elmA.innerHTML = '&amp;' + codeB;
362
- elmN.innerHTML = codeN;
360
+ elmB.innerHTML = '&amp;' + codeA;
361
+ elmA.innerHTML = '&amp;' + codeB;
362
+ elmN.innerHTML = codeN;
363
363
  }