CW Cyrix's Git Repository Mirror
Browse code

TinyMCE version directories relocated to /tinymce/ directory, each with its own version numbers: 2, 3, 4 - Slight naming tweak to TinyMCE dropdown in site settings

Clarissa Walker authored on 2026/07/27 13:46:03
Showing 1 changed files
tinymce2/jscripts/tiny_mce/plugins/table/merge_cells.htm
History View file @ 6d0a884
1 1 
deleted file mode 100644
... ... 
@@ -1,38 +0,0 @@
1 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
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"></script>
6 
-	<script type="text/javascript" src="../../utils/mctabs.js"></script>
7 
-	<script type="text/javascript" src="../../utils/validate.js"></script>
8 
-	<script type="text/javascript" src="js/merge_cells.js"></script>
9 
-	<base target="_self" />
10 
-</head>
11 
-<body style="margin: 8px" style="display: none">
12 
-<form onsubmit="mergeCells();return false;" action="#">
13 
-	<fieldset>
14 
-		<legend>{#table_dlg.merge_cells_title}</legend>
15 
-		  <table border="0" cellpadding="0" cellspacing="3" width="100%">
16 
-			  <tr>
17 
-				<td>{#table_dlg.cols}:</td>
18 
-				<td align="right"><input type="text" name="numcols" value="" class="number min1 mceFocus" style="width: 30px" /></td>
19 
-			  </tr>
20 
-			  <tr>
21 
-				<td>{#table_dlg.rows}:</td>
22 
-				<td align="right"><input type="text" name="numrows" value="" class="number min1" style="width: 30px" /></td>
23 
-			  </tr>
24 
-		  </table>
25 
-	</fieldset>
26 
-
27 
-	<div class="mceActionPanel">
28 
-		<div style="float: left">
29 
-			<input type="submit" id="insert" name="insert" value="{#update}" />
30 
-		</div>
31 
-
32 
-		<div style="float: right">
33 
-			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
34 
-		</div>
35 
-	</div>
36 
-</form>
37 
-</body>
38 
-</html>
Browse code

Actually use TinyMCE 3.4.8 for TinyMCE3 option instead of original 2.0.1; that version is moved to 'tinymce2' directory

Clarissa Walker authored on 2026/07/27 09:02:31
Showing 1 changed files
tinymce2/jscripts/tiny_mce/plugins/table/merge_cells.htm
History View file @ 7e741da
1 1 
new file mode 100644
... ... 
@@ -0,0 +1,38 @@
1 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
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"></script>
6 
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
7 
+	<script type="text/javascript" src="../../utils/validate.js"></script>
8 
+	<script type="text/javascript" src="js/merge_cells.js"></script>
9 
+	<base target="_self" />
10 
+</head>
11 
+<body style="margin: 8px" style="display: none">
12 
+<form onsubmit="mergeCells();return false;" action="#">
13 
+	<fieldset>
14 
+		<legend>{#table_dlg.merge_cells_title}</legend>
15 
+		  <table border="0" cellpadding="0" cellspacing="3" width="100%">
16 
+			  <tr>
17 
+				<td>{#table_dlg.cols}:</td>
18 
+				<td align="right"><input type="text" name="numcols" value="" class="number min1 mceFocus" style="width: 30px" /></td>
19 
+			  </tr>
20 
+			  <tr>
21 
+				<td>{#table_dlg.rows}:</td>
22 
+				<td align="right"><input type="text" name="numrows" value="" class="number min1" style="width: 30px" /></td>
23 
+			  </tr>
24 
+		  </table>
25 
+	</fieldset>
26 
+
27 
+	<div class="mceActionPanel">
28 
+		<div style="float: left">
29 
+			<input type="submit" id="insert" name="insert" value="{#update}" />
30 
+		</div>
31 
+
32 
+		<div style="float: right">
33 
+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
34 
+		</div>
35 
+	</div>
36 
+</form>
37 
+</body>
38 
+</html>