lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Updating TinyMce to latest version

Browse Source 
- Corrects IE9 issues

--HG--
branch : dev
This commit is contained in:
Sébastien Ros
2010-10-17 10:20:57 -07:00
parent bdea6c5386
commit 5035671ab5
173 changed files with 14454 additions and 10634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm vendored
View File

@@ -8,7 +8,7 @@
<script type="text/javascript" src="js/merge_cells.js"></script>
</head>
<body style="margin: 8px">
<form onsubmit="mergeCells();return false;" action="#">
<form onsubmit="MergeCellsDialog.merge();return false;" action="#">
<fieldset>
<legend>{#table_dlg.merge_cells_title}</legend>
<table border="0" cellpadding="0" cellspacing="3" width="100%">
@@ -24,13 +24,8 @@
</fieldset>
<div class="mceActionPanel">
<div style="float: left">
<input type="submit" id="insert" name="insert" value="{#update}" />
</div>
<div style="float: right">
<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
</div>
<input type="submit" id="insert" name="insert" value="{#update}" />
<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
</div>
</form>
</body>