alchemy_cms 2.4.rc2 → 2.4.rc4
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +2 -1
- data/.travis.yml +7 -4
- data/README.md +1 -0
- data/alchemy_cms.gemspec +19 -1
- data/app/assets/javascripts/alchemy/alchemy.dragndrop.js +5 -2
- data/app/assets/javascripts/alchemy/alchemy.link_overlay.js.coffee +1 -1
- data/app/assets/javascripts/alchemy/alchemy.preview_window.js +4 -21
- data/app/assets/javascripts/alchemy/alchemy.windows.js +0 -1
- data/app/assets/stylesheets/alchemy/base.scss +4 -0
- data/app/assets/stylesheets/alchemy/elements.scss +59 -60
- data/app/assets/stylesheets/alchemy/flash.scss +3 -3
- data/app/assets/stylesheets/alchemy/form_elements.scss +15 -2
- data/app/assets/stylesheets/alchemy/jquery-ui.scss +11 -3
- data/app/assets/stylesheets/alchemy/mixins.scss +9 -0
- data/app/assets/stylesheets/alchemy/tinymce_content.css.scss +1 -1
- data/app/assets/stylesheets/alchemy/tinymce_dialog.css.scss +4 -0
- data/app/assets/stylesheets/alchemy/variables.scss +5 -1
- data/app/controllers/alchemy/admin/base_controller.rb +18 -3
- data/app/controllers/alchemy/admin/elements_controller.rb +4 -7
- data/app/controllers/alchemy/admin/pages_controller.rb +3 -4
- data/app/controllers/alchemy/admin/resources_controller.rb +1 -18
- data/app/controllers/alchemy/admin/users_controller.rb +8 -5
- data/app/helpers/alchemy/admin/pages_helper.rb +6 -1
- data/app/models/alchemy/content.rb +26 -5
- data/app/models/alchemy/element.rb +1 -0
- data/app/models/alchemy/essence_richtext.rb +1 -1
- data/app/models/alchemy/page.rb +131 -88
- data/app/views/alchemy/admin/clipboard/insert.js.erb +1 -1
- data/app/views/alchemy/admin/elements/create.js.erb +6 -1
- data/app/views/alchemy/admin/elements/trash.js.erb +1 -3
- data/app/views/alchemy/admin/resources/_form.html.erb +13 -1
- data/app/views/alchemy/admin/trash/index.html.erb +1 -1
- data/app/views/alchemy/base/remote_errors.js.erb +5 -1
- data/app/views/alchemy/essences/_essence_link_view.html.erb +2 -0
- data/app/views/alchemy/essences/_essence_richtext_editor.html.erb +1 -1
- data/config/locales/alchemy.de.yml +11 -4
- data/lib/alchemy/capistrano.rb +59 -1
- data/lib/alchemy/essence.rb +1 -0
- data/lib/alchemy/seeder.rb +39 -49
- data/lib/alchemy/tinymce.rb +1 -1
- data/lib/alchemy/version.rb +1 -1
- data/lib/rails/generators/alchemy/deploy_script/deploy_script_generator.rb +1 -1
- data/lib/rails/generators/alchemy/deploy_script/templates/deploy.rb.tt +3 -0
- data/lib/rails/generators/alchemy/elements/templates/view.html.haml +2 -2
- data/lib/rails/generators/alchemy/elements/templates/view.html.slim +2 -2
- data/lib/tasks/database.rake +25 -0
- data/lib/tasks/install.rake +5 -14
- data/spec/factories.rb +10 -0
- data/spec/integration/admin/resources_integration_spec.rb +64 -23
- data/spec/integration/pages_controller_spec.rb +0 -2
- data/spec/libraries/resources_helper_spec.rb +6 -2
- data/spec/models/content_spec.rb +31 -0
- data/spec/models/element_spec.rb +7 -2
- data/spec/models/page_spec.rb +36 -0
- data/vendor/assets/javascripts/jquery_plugins/jquery.dialogextend.1_0_1.js +676 -0
- data/vendor/assets/javascripts/jquery_plugins/jquery.ui.tabspaging.js +298 -238
- data/vendor/assets/javascripts/tiny_mce/langs/de.js +1 -1
- data/vendor/assets/javascripts/tiny_mce/langs/en.js +1 -1
- data/vendor/assets/javascripts/tiny_mce/license.txt +6 -6
- data/vendor/assets/javascripts/tiny_mce/plugins/fullscreen/editor_plugin.js +1 -1
- data/vendor/assets/javascripts/tiny_mce/plugins/fullscreen/fullscreen.htm +97 -97
- data/vendor/assets/javascripts/tiny_mce/plugins/inlinepopups/template.htm +376 -386
- data/vendor/assets/javascripts/tiny_mce/plugins/paste/editor_plugin.js +1 -1
- data/vendor/assets/javascripts/tiny_mce/plugins/paste/js/pastetext.js +30 -30
- data/vendor/assets/javascripts/tiny_mce/plugins/paste/js/pasteword.js +45 -45
- data/vendor/assets/javascripts/tiny_mce/plugins/paste/langs/de_dlg.js +1 -1
- data/vendor/assets/javascripts/tiny_mce/plugins/paste/pastetext.htm +17 -20
- data/vendor/assets/javascripts/tiny_mce/plugins/paste/pasteword.htm +12 -12
- data/vendor/assets/javascripts/tiny_mce/plugins/table/cell.htm +173 -183
- data/vendor/assets/javascripts/tiny_mce/plugins/table/css/cell.css +4 -4
- data/vendor/assets/javascripts/tiny_mce/plugins/table/css/row.css +7 -7
- data/vendor/assets/javascripts/tiny_mce/plugins/table/css/table.css +3 -3
- data/vendor/assets/javascripts/tiny_mce/plugins/table/editor_plugin.js +1 -1
- data/vendor/assets/javascripts/tiny_mce/plugins/table/js/cell.js +280 -282
- data/vendor/assets/javascripts/tiny_mce/plugins/table/js/merge_cells.js +15 -15
- data/vendor/assets/javascripts/tiny_mce/plugins/table/js/row.js +221 -204
- data/vendor/assets/javascripts/tiny_mce/plugins/table/js/table.js +448 -435
- data/vendor/assets/javascripts/tiny_mce/plugins/table/langs/de_dlg.js +1 -1
- data/vendor/assets/javascripts/tiny_mce/plugins/table/merge_cells.htm +22 -24
- data/vendor/assets/javascripts/tiny_mce/plugins/table/row.htm +136 -144
- data/vendor/assets/javascripts/tiny_mce/plugins/table/table.htm +168 -184
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/about.htm +46 -62
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/anchor.htm +16 -17
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/charmap.htm +47 -56
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/color_picker.htm +52 -69
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/editor_template.js +1 -852
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/image.htm +69 -79
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/img/icons.gif +0 -0
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/about.js +48 -48
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/anchor.js +50 -37
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/charmap.js +317 -317
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/color_picker.js +345 -331
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/image.js +248 -246
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/link.js +152 -146
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/js/source_editor.js +53 -31
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/de.js +1 -1
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/de_dlg.js +1 -1
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/en.js +1 -1
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/langs/en_dlg.js +1 -1
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/link.htm +46 -53
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/shortcuts.htm +45 -57
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/content.css +47 -182
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/dialog.css +93 -399
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/default/ui.css +191 -890
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/highcontrast/content.css +24 -102
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css +79 -377
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css +80 -451
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/content.css +45 -167
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css +93 -399
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui.css +194 -889
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css +7 -33
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css +4 -15
- data/vendor/assets/javascripts/tiny_mce/themes/advanced/source_editor.htm +16 -19
- data/vendor/assets/javascripts/tiny_mce/tiny_mce.js +1 -1
- data/vendor/assets/javascripts/tiny_mce/tiny_mce_popup.js +1 -1
- data/vendor/assets/javascripts/tiny_mce/utils/editable_selects.js +46 -46
- data/vendor/assets/javascripts/tiny_mce/utils/form_utils.js +124 -124
- data/vendor/assets/javascripts/tiny_mce/utils/mctabs.js +112 -112
- data/vendor/assets/javascripts/tiny_mce/utils/validate.js +213 -213
- metadata +11 -6
- data/spec/dummy/public/404.html.bak +0 -26
- data/vendor/assets/javascripts/jquery_plugins/jquery.dialogextend.min.js +0 -8
@@ -3,486 +3,499 @@ tinyMCEPopup.requireLangPack();
|
|
3
3
|
var action, orgTableWidth, orgTableHeight, dom = tinyMCEPopup.editor.dom;
|
4
4
|
|
5
5
|
function insertTable() {
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
|
212
|
-
|
213
|
-
|
214
|
-
|
215
|
-
|
216
|
-
|
217
|
-
|
218
|
-
|
219
|
-
|
220
|
-
|
221
|
-
|
222
|
-
|
223
|
-
|
224
|
-
|
225
|
-
|
226
|
-
|
227
|
-
|
228
|
-
|
229
|
-
|
230
|
-
|
231
|
-
|
232
|
-
|
233
|
-
|
234
|
-
|
235
|
-
|
236
|
-
|
237
|
-
|
238
|
-
|
239
|
-
|
240
|
-
|
241
|
-
|
242
|
-
|
243
|
-
|
244
|
-
|
245
|
-
|
246
|
-
|
247
|
-
|
248
|
-
|
249
|
-
|
250
|
-
|
251
|
-
|
252
|
-
|
253
|
-
|
254
|
-
|
255
|
-
|
256
|
-
|
257
|
-
|
258
|
-
|
259
|
-
|
260
|
-
|
261
|
-
|
262
|
-
|
263
|
-
|
264
|
-
|
265
|
-
|
6
|
+
var formObj = document.forms[0];
|
7
|
+
var inst = tinyMCEPopup.editor, dom = inst.dom;
|
8
|
+
var cols = 2, rows = 2, border = 0, cellpadding = -1, cellspacing = -1, align, width, height, className, caption, frame, rules;
|
9
|
+
var html = '', capEl, elm;
|
10
|
+
var cellLimit, rowLimit, colLimit;
|
11
|
+
|
12
|
+
tinyMCEPopup.restoreSelection();
|
13
|
+
|
14
|
+
if (!AutoValidator.validate(formObj)) {
|
15
|
+
tinyMCEPopup.alert(AutoValidator.getErrorMessages(formObj).join('. ') + '.');
|
16
|
+
return false;
|
17
|
+
}
|
18
|
+
|
19
|
+
elm = dom.getParent(inst.selection.getNode(), 'table');
|
20
|
+
|
21
|
+
// Get form data
|
22
|
+
cols = formObj.elements['cols'].value;
|
23
|
+
rows = formObj.elements['rows'].value;
|
24
|
+
border = formObj.elements['border'].value != "" ? formObj.elements['border'].value : 0;
|
25
|
+
cellpadding = formObj.elements['cellpadding'].value != "" ? formObj.elements['cellpadding'].value : "";
|
26
|
+
cellspacing = formObj.elements['cellspacing'].value != "" ? formObj.elements['cellspacing'].value : "";
|
27
|
+
align = getSelectValue(formObj, "align");
|
28
|
+
frame = getSelectValue(formObj, "tframe");
|
29
|
+
rules = getSelectValue(formObj, "rules");
|
30
|
+
width = formObj.elements['width'].value;
|
31
|
+
height = formObj.elements['height'].value;
|
32
|
+
bordercolor = formObj.elements['bordercolor'].value;
|
33
|
+
bgcolor = formObj.elements['bgcolor'].value;
|
34
|
+
className = getSelectValue(formObj, "class");
|
35
|
+
id = formObj.elements['id'].value;
|
36
|
+
summary = formObj.elements['summary'].value;
|
37
|
+
style = formObj.elements['style'].value;
|
38
|
+
dir = formObj.elements['dir'].value;
|
39
|
+
lang = formObj.elements['lang'].value;
|
40
|
+
background = formObj.elements['backgroundimage'].value;
|
41
|
+
caption = formObj.elements['caption'].checked;
|
42
|
+
|
43
|
+
cellLimit = tinyMCEPopup.getParam('table_cell_limit', false);
|
44
|
+
rowLimit = tinyMCEPopup.getParam('table_row_limit', false);
|
45
|
+
colLimit = tinyMCEPopup.getParam('table_col_limit', false);
|
46
|
+
|
47
|
+
// Validate table size
|
48
|
+
if (colLimit && cols > colLimit) {
|
49
|
+
tinyMCEPopup.alert(inst.getLang('table_dlg.col_limit').replace(/\{\$cols\}/g, colLimit));
|
50
|
+
return false;
|
51
|
+
} else if (rowLimit && rows > rowLimit) {
|
52
|
+
tinyMCEPopup.alert(inst.getLang('table_dlg.row_limit').replace(/\{\$rows\}/g, rowLimit));
|
53
|
+
return false;
|
54
|
+
} else if (cellLimit && cols * rows > cellLimit) {
|
55
|
+
tinyMCEPopup.alert(inst.getLang('table_dlg.cell_limit').replace(/\{\$cells\}/g, cellLimit));
|
56
|
+
return false;
|
57
|
+
}
|
58
|
+
|
59
|
+
// Update table
|
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);
|
79
|
+
dom.setAttrib(elm, 'class', className);
|
80
|
+
dom.setAttrib(elm, 'style', style);
|
81
|
+
dom.setAttrib(elm, 'id', id);
|
82
|
+
dom.setAttrib(elm, 'summary', summary);
|
83
|
+
dom.setAttrib(elm, 'dir', dir);
|
84
|
+
dom.setAttrib(elm, 'lang', lang);
|
85
|
+
|
86
|
+
capEl = inst.dom.select('caption', elm)[0];
|
87
|
+
|
88
|
+
if (capEl && !caption)
|
89
|
+
capEl.parentNode.removeChild(capEl);
|
90
|
+
|
91
|
+
if (!capEl && caption) {
|
92
|
+
capEl = elm.ownerDocument.createElement('caption');
|
93
|
+
|
94
|
+
if (!tinymce.isIE)
|
95
|
+
capEl.innerHTML = '<br data-mce-bogus="1"/>';
|
96
|
+
|
97
|
+
elm.insertBefore(capEl, elm.firstChild);
|
98
|
+
}
|
99
|
+
|
100
|
+
if (width && inst.settings.inline_styles) {
|
101
|
+
dom.setStyle(elm, 'width', width);
|
102
|
+
dom.setAttrib(elm, 'width', '');
|
103
|
+
} else {
|
104
|
+
dom.setAttrib(elm, 'width', width, true);
|
105
|
+
dom.setStyle(elm, 'width', '');
|
106
|
+
}
|
107
|
+
|
108
|
+
// Remove these since they are not valid XHTML
|
109
|
+
dom.setAttrib(elm, 'borderColor', '');
|
110
|
+
dom.setAttrib(elm, 'bgColor', '');
|
111
|
+
dom.setAttrib(elm, 'background', '');
|
112
|
+
|
113
|
+
if (height && inst.settings.inline_styles) {
|
114
|
+
dom.setStyle(elm, 'height', height);
|
115
|
+
dom.setAttrib(elm, 'height', '');
|
116
|
+
} else {
|
117
|
+
dom.setAttrib(elm, 'height', height, true);
|
118
|
+
dom.setStyle(elm, 'height', '');
|
119
|
+
}
|
120
|
+
|
121
|
+
if (background != '')
|
122
|
+
elm.style.backgroundImage = "url('" + background + "')";
|
123
|
+
else
|
124
|
+
elm.style.backgroundImage = '';
|
125
|
+
|
126
|
+
/* if (tinyMCEPopup.getParam("inline_styles")) {
|
127
|
+
if (width != '')
|
128
|
+
elm.style.width = getCSSSize(width);
|
129
|
+
}*/
|
130
|
+
|
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
|
+
|
138
|
+
elm.style.backgroundColor = bgcolor;
|
139
|
+
elm.style.height = getCSSSize(height);
|
140
|
+
|
141
|
+
inst.addVisual();
|
142
|
+
|
143
|
+
// Fix for stange MSIE align bug
|
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)
|
151
|
+
inst.execCommand('mceRepaint');
|
152
|
+
|
153
|
+
tinyMCEPopup.close();
|
154
|
+
return true;
|
155
|
+
}
|
156
|
+
|
157
|
+
// Create new table
|
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');
|
168
|
+
|
169
|
+
if (width && inst.settings.inline_styles) {
|
170
|
+
if (style)
|
171
|
+
style += '; ';
|
172
|
+
|
173
|
+
// Force px
|
174
|
+
if (/^[0-9\.]+$/.test(width))
|
175
|
+
width += 'px';
|
176
|
+
|
177
|
+
style += 'width: ' + width;
|
178
|
+
} else
|
179
|
+
html += makeAttrib('width', width);
|
180
|
+
|
181
|
+
/* if (height) {
|
182
|
+
if (style)
|
183
|
+
style += '; ';
|
184
|
+
|
185
|
+
style += 'height: ' + height;
|
186
|
+
}*/
|
187
|
+
|
188
|
+
//html += makeAttrib('height', height);
|
189
|
+
//html += makeAttrib('bordercolor', bordercolor);
|
190
|
+
//html += makeAttrib('bgcolor', bgcolor);
|
191
|
+
html += makeAttrib('align', align);
|
192
|
+
html += makeAttrib('frame', frame);
|
193
|
+
html += makeAttrib('rules', rules);
|
194
|
+
html += makeAttrib('class', className);
|
195
|
+
html += makeAttrib('style', style);
|
196
|
+
html += makeAttrib('summary', summary);
|
197
|
+
html += makeAttrib('dir', dir);
|
198
|
+
html += makeAttrib('lang', lang);
|
199
|
+
html += '>';
|
200
|
+
|
201
|
+
if (caption) {
|
202
|
+
if (!tinymce.isIE)
|
203
|
+
html += '<caption><br data-mce-bogus="1"/></caption>';
|
204
|
+
else
|
205
|
+
html += '<caption></caption>';
|
206
|
+
}
|
207
|
+
|
208
|
+
for (var y=0; y<rows; y++) {
|
209
|
+
html += "<tr>";
|
210
|
+
|
211
|
+
for (var x=0; x<cols; x++) {
|
212
|
+
if (!tinymce.isIE)
|
213
|
+
html += '<td><br data-mce-bogus="1"/></td>';
|
214
|
+
else
|
215
|
+
html += '<td></td>';
|
216
|
+
}
|
217
|
+
|
218
|
+
html += "</tr>";
|
219
|
+
}
|
220
|
+
|
221
|
+
html += "</table>";
|
222
|
+
|
223
|
+
// Move table
|
224
|
+
if (inst.settings.fix_table_elements) {
|
225
|
+
var patt = '';
|
226
|
+
|
227
|
+
inst.focus();
|
228
|
+
inst.selection.setContent('<br class="_mce_marker" />');
|
229
|
+
|
230
|
+
tinymce.each('h1,h2,h3,h4,h5,h6,p'.split(','), function(n) {
|
231
|
+
if (patt)
|
232
|
+
patt += ',';
|
233
|
+
|
234
|
+
patt += n + ' ._mce_marker';
|
235
|
+
});
|
236
|
+
|
237
|
+
tinymce.each(inst.dom.select(patt), function(n) {
|
238
|
+
inst.dom.split(inst.dom.getParent(n, 'h1,h2,h3,h4,h5,h6,p'), n);
|
239
|
+
});
|
240
|
+
|
241
|
+
dom.setOuterHTML(dom.select('br._mce_marker')[0], html);
|
242
|
+
} else
|
243
|
+
inst.execCommand('mceInsertContent', false, html);
|
244
|
+
|
245
|
+
tinymce.each(dom.select('table[data-mce-new]'), function(node) {
|
246
|
+
var tdorth = dom.select('td,th', node);
|
247
|
+
|
248
|
+
// Fixes a bug in IE where the caret cannot be placed after the table if the table is at the end of the document
|
249
|
+
if (tinymce.isIE && node.nextSibling == null) {
|
250
|
+
if (inst.settings.forced_root_block)
|
251
|
+
dom.insertAfter(dom.create(inst.settings.forced_root_block), node);
|
252
|
+
else
|
253
|
+
dom.insertAfter(dom.create('br', {'data-mce-bogus': '1'}), node);
|
254
|
+
}
|
255
|
+
|
256
|
+
try {
|
257
|
+
// IE9 might fail to do this selection
|
258
|
+
inst.selection.setCursorLocation(tdorth[0], 0);
|
259
|
+
} catch (ex) {
|
260
|
+
// Ignore
|
261
|
+
}
|
262
|
+
|
263
|
+
dom.setAttrib(node, 'data-mce-new', '');
|
264
|
+
});
|
265
|
+
|
266
|
+
inst.addVisual();
|
267
|
+
inst.execCommand('mceEndUndoLevel', false, {}, {skip_undo: true});
|
268
|
+
|
269
|
+
tinyMCEPopup.close();
|
266
270
|
}
|
267
271
|
|
268
272
|
function makeAttrib(attrib, value) {
|
269
|
-
|
270
|
-
|
273
|
+
var formObj = document.forms[0];
|
274
|
+
var valueElm = formObj.elements[attrib];
|
271
275
|
|
272
|
-
|
273
|
-
|
276
|
+
if (typeof(value) == "undefined" || value == null) {
|
277
|
+
value = "";
|
274
278
|
|
275
|
-
|
276
|
-
|
277
|
-
|
279
|
+
if (valueElm)
|
280
|
+
value = valueElm.value;
|
281
|
+
}
|
278
282
|
|
279
|
-
|
280
|
-
|
283
|
+
if (value == "")
|
284
|
+
return "";
|
281
285
|
|
282
|
-
|
283
|
-
|
284
|
-
|
285
|
-
|
286
|
-
|
286
|
+
// XML encode it
|
287
|
+
value = value.replace(/&/g, '&');
|
288
|
+
value = value.replace(/\"/g, '"');
|
289
|
+
value = value.replace(/</g, '<');
|
290
|
+
value = value.replace(/>/g, '>');
|
287
291
|
|
288
|
-
|
292
|
+
return ' ' + attrib + '="' + value + '"';
|
289
293
|
}
|
290
294
|
|
291
295
|
function init() {
|
292
|
-
|
293
|
-
|
294
|
-
|
295
|
-
|
296
|
-
|
297
|
-
|
298
|
-
|
299
|
-
|
300
|
-
|
301
|
-
|
302
|
-
|
303
|
-
|
304
|
-
|
305
|
-
|
306
|
-
|
307
|
-
|
308
|
-
|
309
|
-
|
310
|
-
|
311
|
-
|
312
|
-
|
313
|
-
|
314
|
-
|
315
|
-
|
316
|
-
|
317
|
-
|
318
|
-
|
319
|
-
|
320
|
-
|
321
|
-
|
322
|
-
|
323
|
-
|
324
|
-
|
325
|
-
|
326
|
-
|
327
|
-
|
328
|
-
|
329
|
-
|
330
|
-
|
331
|
-
|
332
|
-
|
333
|
-
|
334
|
-
|
335
|
-
|
336
|
-
|
337
|
-
|
338
|
-
|
339
|
-
|
340
|
-
|
341
|
-
|
342
|
-
|
343
|
-
|
344
|
-
|
345
|
-
|
346
|
-
|
347
|
-
|
348
|
-
|
349
|
-
|
350
|
-
|
351
|
-
|
352
|
-
|
353
|
-
|
354
|
-
|
355
|
-
|
356
|
-
|
357
|
-
|
358
|
-
|
359
|
-
|
360
|
-
|
361
|
-
|
362
|
-
|
363
|
-
|
364
|
-
|
365
|
-
|
366
|
-
|
367
|
-
|
368
|
-
|
369
|
-
|
370
|
-
|
371
|
-
|
372
|
-
|
373
|
-
|
374
|
-
|
375
|
-
|
376
|
-
|
377
|
-
|
378
|
-
|
379
|
-
|
380
|
-
|
381
|
-
|
382
|
-
|
383
|
-
|
296
|
+
tinyMCEPopup.resizeToInnerSize();
|
297
|
+
|
298
|
+
document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
|
299
|
+
document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
|
300
|
+
document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick','bordercolor');
|
301
|
+
document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
|
302
|
+
|
303
|
+
var cols = 2, rows = 2, border = tinyMCEPopup.getParam('table_default_border', '0'), cellpadding = tinyMCEPopup.getParam('table_default_cellpadding', ''), cellspacing = tinyMCEPopup.getParam('table_default_cellspacing', '');
|
304
|
+
var align = "", width = "", height = "", bordercolor = "", bgcolor = "", className = "";
|
305
|
+
var id = "", summary = "", style = "", dir = "", lang = "", background = "", bgcolor = "", bordercolor = "", rules = "", frame = "";
|
306
|
+
var inst = tinyMCEPopup.editor, dom = inst.dom;
|
307
|
+
var formObj = document.forms[0];
|
308
|
+
var elm = dom.getParent(inst.selection.getNode(), "table");
|
309
|
+
|
310
|
+
// Hide advanced fields that isn't available in the schema
|
311
|
+
tinymce.each("summary id rules dir style frame".split(" "), function(name) {
|
312
|
+
var tr = tinyMCEPopup.dom.getParent(name, "tr") || tinyMCEPopup.dom.getParent("t" + name, "tr");
|
313
|
+
|
314
|
+
if (tr && !tinyMCEPopup.editor.schema.isValid("table", name)) {
|
315
|
+
tr.style.display = 'none';
|
316
|
+
}
|
317
|
+
});
|
318
|
+
|
319
|
+
action = tinyMCEPopup.getWindowArg('action');
|
320
|
+
|
321
|
+
if (!action)
|
322
|
+
action = elm ? "update" : "insert";
|
323
|
+
|
324
|
+
if (elm && action != "insert") {
|
325
|
+
var rowsAr = elm.rows;
|
326
|
+
var cols = 0;
|
327
|
+
for (var i=0; i<rowsAr.length; i++)
|
328
|
+
if (rowsAr[i].cells.length > cols)
|
329
|
+
cols = rowsAr[i].cells.length;
|
330
|
+
|
331
|
+
cols = cols;
|
332
|
+
rows = rowsAr.length;
|
333
|
+
|
334
|
+
st = dom.parseStyle(dom.getAttrib(elm, "style"));
|
335
|
+
border = trimSize(getStyle(elm, 'border', 'borderWidth'));
|
336
|
+
cellpadding = dom.getAttrib(elm, 'cellpadding', "");
|
337
|
+
cellspacing = dom.getAttrib(elm, 'cellspacing', "");
|
338
|
+
width = trimSize(getStyle(elm, 'width', 'width'));
|
339
|
+
height = trimSize(getStyle(elm, 'height', 'height'));
|
340
|
+
bordercolor = convertRGBToHex(getStyle(elm, 'bordercolor', 'borderLeftColor'));
|
341
|
+
bgcolor = convertRGBToHex(getStyle(elm, 'bgcolor', 'backgroundColor'));
|
342
|
+
align = dom.getAttrib(elm, 'align', align);
|
343
|
+
frame = dom.getAttrib(elm, 'frame');
|
344
|
+
rules = dom.getAttrib(elm, 'rules');
|
345
|
+
className = tinymce.trim(dom.getAttrib(elm, 'class').replace(/mceItem.+/g, ''));
|
346
|
+
id = dom.getAttrib(elm, 'id');
|
347
|
+
summary = dom.getAttrib(elm, 'summary');
|
348
|
+
style = dom.serializeStyle(st);
|
349
|
+
dir = dom.getAttrib(elm, 'dir');
|
350
|
+
lang = dom.getAttrib(elm, 'lang');
|
351
|
+
background = getStyle(elm, 'background', 'backgroundImage').replace(new RegExp("url\\(['\"]?([^'\"]*)['\"]?\\)", 'gi'), "$1");
|
352
|
+
formObj.caption.checked = elm.getElementsByTagName('caption').length > 0;
|
353
|
+
|
354
|
+
orgTableWidth = width;
|
355
|
+
orgTableHeight = height;
|
356
|
+
|
357
|
+
action = "update";
|
358
|
+
formObj.insert.value = inst.getLang('update');
|
359
|
+
}
|
360
|
+
|
361
|
+
addClassesToList('class', "table_styles");
|
362
|
+
TinyMCE_EditableSelects.init();
|
363
|
+
|
364
|
+
// Update form
|
365
|
+
selectByValue(formObj, 'align', align);
|
366
|
+
selectByValue(formObj, 'tframe', frame);
|
367
|
+
selectByValue(formObj, 'rules', rules);
|
368
|
+
selectByValue(formObj, 'class', className, true, true);
|
369
|
+
formObj.cols.value = cols;
|
370
|
+
formObj.rows.value = rows;
|
371
|
+
formObj.border.value = border;
|
372
|
+
formObj.cellpadding.value = cellpadding;
|
373
|
+
formObj.cellspacing.value = cellspacing;
|
374
|
+
formObj.width.value = width;
|
375
|
+
formObj.height.value = height;
|
376
|
+
formObj.bordercolor.value = bordercolor;
|
377
|
+
formObj.bgcolor.value = bgcolor;
|
378
|
+
formObj.id.value = id;
|
379
|
+
formObj.summary.value = summary;
|
380
|
+
formObj.style.value = style;
|
381
|
+
formObj.dir.value = dir;
|
382
|
+
formObj.lang.value = lang;
|
383
|
+
formObj.backgroundimage.value = background;
|
384
|
+
|
385
|
+
updateColor('bordercolor_pick', 'bordercolor');
|
386
|
+
updateColor('bgcolor_pick', 'bgcolor');
|
387
|
+
|
388
|
+
// Resize some elements
|
389
|
+
if (isVisible('backgroundimagebrowser'))
|
390
|
+
document.getElementById('backgroundimage').style.width = '180px';
|
391
|
+
|
392
|
+
// Disable some fields in update mode
|
393
|
+
if (action == "update") {
|
394
|
+
formObj.cols.disabled = true;
|
395
|
+
formObj.rows.disabled = true;
|
396
|
+
}
|
384
397
|
}
|
385
398
|
|
386
399
|
function changedSize() {
|
387
|
-
|
388
|
-
|
389
|
-
|
390
|
-
|
391
|
-
|
392
|
-
|
393
|
-
|
394
|
-
|
395
|
-
|
396
|
-
|
397
|
-
|
398
|
-
|
399
|
-
|
400
|
-
|
401
|
-
|
402
|
-
|
400
|
+
var formObj = document.forms[0];
|
401
|
+
var st = dom.parseStyle(formObj.style.value);
|
402
|
+
|
403
|
+
/* var width = formObj.width.value;
|
404
|
+
if (width != "")
|
405
|
+
st['width'] = tinyMCEPopup.getParam("inline_styles") ? getCSSSize(width) : "";
|
406
|
+
else
|
407
|
+
st['width'] = "";*/
|
408
|
+
|
409
|
+
var height = formObj.height.value;
|
410
|
+
if (height != "")
|
411
|
+
st['height'] = getCSSSize(height);
|
412
|
+
else
|
413
|
+
st['height'] = "";
|
414
|
+
|
415
|
+
formObj.style.value = dom.serializeStyle(st);
|
403
416
|
}
|
404
417
|
|
405
418
|
function isCssSize(value) {
|
406
|
-
|
419
|
+
return /^[0-9.]+(%|in|cm|mm|em|ex|pt|pc|px)$/.test(value);
|
407
420
|
}
|
408
421
|
|
409
422
|
function cssSize(value, def) {
|
410
|
-
|
423
|
+
value = tinymce.trim(value || def);
|
411
424
|
|
412
|
-
|
413
|
-
|
414
|
-
|
425
|
+
if (!isCssSize(value)) {
|
426
|
+
return parseInt(value, 10) + 'px';
|
427
|
+
}
|
415
428
|
|
416
|
-
|
429
|
+
return value;
|
417
430
|
}
|
418
431
|
|
419
432
|
function changedBackgroundImage() {
|
420
|
-
|
421
|
-
|
433
|
+
var formObj = document.forms[0];
|
434
|
+
var st = dom.parseStyle(formObj.style.value);
|
422
435
|
|
423
|
-
|
436
|
+
st['background-image'] = "url('" + formObj.backgroundimage.value + "')";
|
424
437
|
|
425
|
-
|
438
|
+
formObj.style.value = dom.serializeStyle(st);
|
426
439
|
}
|
427
440
|
|
428
441
|
function changedBorder() {
|
429
|
-
|
430
|
-
|
431
|
-
|
432
|
-
|
433
|
-
|
434
|
-
|
435
|
-
|
436
|
-
|
437
|
-
|
438
|
-
|
439
|
-
|
440
|
-
|
441
|
-
|
442
|
-
|
442
|
+
var formObj = document.forms[0];
|
443
|
+
var st = dom.parseStyle(formObj.style.value);
|
444
|
+
|
445
|
+
// Update border width if the element has a color
|
446
|
+
if (formObj.border.value != "" && (isCssSize(formObj.border.value) || formObj.bordercolor.value != ""))
|
447
|
+
st['border-width'] = cssSize(formObj.border.value);
|
448
|
+
else {
|
449
|
+
if (!formObj.border.value) {
|
450
|
+
st['border'] = '';
|
451
|
+
st['border-width'] = '';
|
452
|
+
}
|
453
|
+
}
|
454
|
+
|
455
|
+
formObj.style.value = dom.serializeStyle(st);
|
443
456
|
}
|
444
457
|
|
445
458
|
function changedColor() {
|
446
|
-
|
447
|
-
|
459
|
+
var formObj = document.forms[0];
|
460
|
+
var st = dom.parseStyle(formObj.style.value);
|
448
461
|
|
449
|
-
|
462
|
+
st['background-color'] = formObj.bgcolor.value;
|
450
463
|
|
451
|
-
|
452
|
-
|
464
|
+
if (formObj.bordercolor.value != "") {
|
465
|
+
st['border-color'] = formObj.bordercolor.value;
|
453
466
|
|
454
|
-
|
455
|
-
|
456
|
-
|
457
|
-
|
467
|
+
// Add border-width if it's missing
|
468
|
+
if (!st['border-width'])
|
469
|
+
st['border-width'] = cssSize(formObj.border.value, 1);
|
470
|
+
}
|
458
471
|
|
459
|
-
|
472
|
+
formObj.style.value = dom.serializeStyle(st);
|
460
473
|
}
|
461
474
|
|
462
475
|
function changedStyle() {
|
463
|
-
|
464
|
-
|
476
|
+
var formObj = document.forms[0];
|
477
|
+
var st = dom.parseStyle(formObj.style.value);
|
465
478
|
|
466
|
-
|
467
|
-
|
468
|
-
|
469
|
-
|
479
|
+
if (st['background-image'])
|
480
|
+
formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\(['\"]?([^'\"]*)['\"]?\\)", 'gi'), "$1");
|
481
|
+
else
|
482
|
+
formObj.backgroundimage.value = '';
|
470
483
|
|
471
|
-
|
472
|
-
|
484
|
+
if (st['width'])
|
485
|
+
formObj.width.value = trimSize(st['width']);
|
473
486
|
|
474
|
-
|
475
|
-
|
487
|
+
if (st['height'])
|
488
|
+
formObj.height.value = trimSize(st['height']);
|
476
489
|
|
477
|
-
|
478
|
-
|
479
|
-
|
480
|
-
|
490
|
+
if (st['background-color']) {
|
491
|
+
formObj.bgcolor.value = st['background-color'];
|
492
|
+
updateColor('bgcolor_pick','bgcolor');
|
493
|
+
}
|
481
494
|
|
482
|
-
|
483
|
-
|
484
|
-
|
485
|
-
|
495
|
+
if (st['border-color']) {
|
496
|
+
formObj.bordercolor.value = st['border-color'];
|
497
|
+
updateColor('bordercolor_pick','bordercolor');
|
498
|
+
}
|
486
499
|
}
|
487
500
|
|
488
501
|
tinyMCEPopup.onInit.add(init);
|