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

9
lib/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js vendored
View File

@@ -1,8 +1,11 @@
/**
* $Id: editor_plugin_src.js 787 2008-04-10 11:40:57Z spocke $
* editor_plugin_src.js
*
* @author Moxiecode
* @copyright Copyright <20> 2004-2008, Moxiecode Systems AB, All rights reserved.
* Copyright 2009, Moxiecode Systems AB
* Released under LGPL License.
*
* License: http://tinymce.moxiecode.com/license
* Contributing: http://tinymce.moxiecode.com/contributing
*/
(function() {

15
lib/tinymce/jscripts/tiny_mce/plugins/style/props.htm vendored
View File

@@ -40,7 +40,7 @@
<tr>
<td><select id="text_size" name="text_size" class="mceEditableSelect"></select></td>
<td>&nbsp;</td>
<td><select id="text_size_measurement" name="text_size_measurement"></select></td>
<td><select id="text_size_measurement" name="text_size_measurement"></select></td>
</tr>
</table>
</td>
@@ -709,16 +709,9 @@
</div>
<div class="mceActionPanel">
<div style="float: left">
<div style="float: left"><input type="submit" id="insert" name="insert" value="{#update}" /></div>
<div style="float: left">&nbsp;<input type="button" class="button" id="apply" name="apply" value="{#style_dlg.apply}" onClick="applyAction();" /></div>
<br style="clear: both" />
</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" class="button" id="apply" name="apply" value="{#style_dlg.apply}" onClick="applyAction();" />
<input type="button" id="cancel" name="cancel" value="{#cancel}" onClick="tinyMCEPopup.close();" />
</div>
</form>