Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-05 10:22:23 +01:00
Code Issues Projects Releases Wiki Activity
19,687 Commits 50 Branches 747 Tags 789 MiB
e1a28534d0
Commit Graph

61 Commits

Author SHA1 Message Date
Andrew Ozz
b35ac4a005 Update TinyMCE to 3.5.6, see #21173 
git-svn-id: http://core.svn.wordpress.org/trunk@21545 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-08-18 23:24:27 +00:00
bumpbot
4a5816348c Compress scripts/styles: 3.5-alpha-21255. TinyMCE updated. 
git-svn-id: http://core.svn.wordpress.org/trunk@21255 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-07-10 02:58:25 +00:00
azaozz
90deeab136 TinyMCE: when pressing Enter while an image with caption is selected, fix moving the caret in a new paragraph under it, fix opening the Image Properties popup in IE9, see #21173 
git-svn-id: http://core.svn.wordpress.org/trunk@21254 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-07-10 02:31:30 +00:00
bumpbot
f40ddd4ecc Compress scripts/styles: 3.5-alpha-21233. TinyMCE updated. 
git-svn-id: http://core.svn.wordpress.org/trunk@21233 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-07-08 22:58:20 +00:00
azaozz
851db96416 TinyMCE: don't throw fatal errors for malformed/invalid image caption shortcodes, props SergeyBiryukov, see #21145 
git-svn-id: http://core.svn.wordpress.org/trunk@21232 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-07-08 21:11:23 +00:00
azaozz
d2c389657d Image captions: change query arg in the Edit Image iframe HTML to refresh browser cache, see #18311 
git-svn-id: http://core.svn.wordpress.org/trunk@20831 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-05-18 23:09:59 +00:00
bumpbot
5a37c2f523 Compress scripts/styles: 3.4-beta3-20681. TinyMCE updated. 
git-svn-id: http://core.svn.wordpress.org/trunk@20681 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-05-02 01:58:25 +00:00
azaozz
e8beafd57b Change the image caption shortcode format to [caption ...]<a><img /></a> caption text + html[/caption]. That way HTML tags in captions are better supported and the shortcode wouldn't break when using the wrong quotes. Props sushkov, nacin, fixes #18311 
git-svn-id: http://core.svn.wordpress.org/trunk@20679 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-05-02 01:14:52 +00:00
nacin
5d2090ee53 Move to pixels to avoid off-by-one rendering in Chrome. props trepmal. fixes #20402. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@20597 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-04-25 20:56:26 +00:00
nacin
841cda2d1a Remove monospace from TinyMCE caption/alignment image edit popup. see #18311. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@20593 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-04-25 19:54:04 +00:00
bumpbot
32e1568691 Compress scripts/styles: 3.4-alpha-20343. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@20343 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-04-02 22:58:19 +00:00
azaozz
06aedd898e Editor: fix adding a link in WebKit to floated image, fixes #16569 
git-svn-id: http://svn.automattic.com/wordpress/trunk@20341 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-04-02 22:16:30 +00:00
bumpbot
d675c19762 Compress scripts/styles: 3.4-alpha-20175. TinyMCE updated. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@20175 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-03-14 22:00:22 +00:00
azaozz
ca3ab6c5c2 Add support for line breaks to the caption textareas, see #18311 
git-svn-id: http://svn.automattic.com/wordpress/trunk@20174 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-03-14 21:53:11 +00:00
bumpbot
769e6a9a39 Compress scripts/styles: 3.4-alpha-20115. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@20115 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-03-05 07:45:20 +00:00
azaozz
9f4408c741 Based on the current UX feedback, remove the "Insert Link" UI from under the caption fields, see #18311 
git-svn-id: http://svn.automattic.com/wordpress/trunk@20114 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-03-05 07:31:31 +00:00
bumpbot
b7b715a262 Compress scripts/styles: 3.4-alpha-20014. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@20014 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-02-28 14:18:24 +00:00
azaozz
488c1f5a5a HTML in image captions: improve converting the caption html elements to a shortcode, catch some rare cases where image with a caption is pasted in the visual editor, see #18311 
git-svn-id: http://svn.automattic.com/wordpress/trunk@20013 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-02-28 08:03:40 +00:00
bumpbot
fa3d2e0df3 Compress scripts/styles: 3.4-alpha-19985. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19985 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-02-24 19:30:59 +00:00
azaozz
77133d2c96 Don't show edit/remove image buttons in the visual editor when an image is floated, doesn't have a caption and there is text in the same paragraph, props solarissmoke, fixes #19611 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19984 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-02-24 19:18:59 +00:00
bumpbot
a24bfc4d47 Compress scripts/styles: 3.4-alpha-19983. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19983 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-02-24 02:00:58 +00:00
azaozz
73c87020c7 HTML in image captions, first run, see #18311 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19982 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-02-24 01:58:18 +00:00
bumpbot
346c855a40 Compress scripts/styles: 3.4-alpha-19978. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19978 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-02-22 03:15:57 +00:00
azaozz
151b1088cc Use native TinyMCE popup for the image properties dialog, fixes #20096, see #20094 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19977 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-02-22 03:05:25 +00:00
azaozz
4c10d04190 Load TinyMCE's non-minified "*src.js" plugin files when SCRIPT_DEBUG is defined, part props ericlewis, fixes #20055 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19945 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-02-18 06:43:47 +00:00
ryan
e3b46b25d3 Lose EOF ?>. Clean up EOF newlines. fixes #12307 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19712 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2012-01-08 17:01:11 +00:00
azaozz
bcd3030d0e Fix js error on mousedown in the editor, props joehoyle, fixes #19165 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19180 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-11-05 19:49:42 +00:00
azaozz
ee93344f32 More css cleanup, fix styles in the Edit Image popup then the editor is on the front end see #18314 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19116 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-11-02 15:24:56 +00:00
azaozz
4428b4c435 Improve the image drag-resize detection in the visual editor (supported in FF and IE only), remove the size-* class if the image is soft-resized, see #18107 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18702 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2011-09-18 03:00:13 +00:00
azaozz
28466e59f1 Editor: utilize the new "formats" option in TinyMCE, fix errors in IE when pressing Enter inside a caption box, fix resizing of the caption box when the user soft-resizes the image in the editor, fixes #12574 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16090 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-10-29 20:06:00 +00:00
azaozz
c62d0b2e1b Editor: stop inserting empty paragraphs before/after captioned images, see #15095 
git-svn-id: http://svn.automattic.com/wordpress/trunk@15822 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-10-16 22:11:31 +00:00
azaozz
70d6691f15 Clean CSS of the Edit Image popup in the visual editor props Simek, show changed image size and fill width or height when left blank, fixes #11655, fixes #10442 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12660 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2010-01-08 13:06:17 +00:00
azaozz
aac51df0e9 Fix timeout for the inline buttons on images in TinyMCE. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12115 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2009-10-27 09:06:26 +00:00
azaozz
a4996245ec PressThis: fix TinyMCE config and IE6 css "hasLayout" 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12112 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2009-10-27 00:23:58 +00:00
azaozz
f5c253376e When inserting the embed shortcode in TinyMCE replace it with a placeholder image, update the 'wordpress', 'wpeditimage' and 'wpgallery' TinyMCE plugins, fix the audio and video "From URL" tabs in the uploader popup to accept only URLs for embedding, see #10337 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12098 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2009-10-24 11:43:42 +00:00
azaozz
201d24f044 TinyMCE in Firefox: fix crash when dragging images with caption, drag the image together with the caption (only in Firefox 3.5+) 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12085 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2009-10-22 05:30:29 +00:00
azaozz
8011e6016b TinyMCE 3.2.2.3, has several bugfixes 
git-svn-id: http://svn.automattic.com/wordpress/trunk@10845 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2009-03-27 12:57:25 +00:00
azaozz
7cf1bbfcc7 TinyMCE: minify the custom plugins, remove unneeded CSS, load in the footer 
git-svn-id: http://svn.automattic.com/wordpress/trunk@10337 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2009-01-09 12:02:59 +00:00
azaozz
3c15f6a8d3 Gallery settings for TinyMCE 
git-svn-id: http://svn.automattic.com/wordpress/trunk@9847 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2008-11-23 06:37:15 +00:00
azaozz
28af5e2493 Fix thickbox for IE6 in wpeditimage 
git-svn-id: http://svn.automattic.com/wordpress/trunk@9730 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2008-11-17 05:51:59 +00:00
azaozz
6adb94fd45 TinyMCE 3.2.1 
git-svn-id: http://svn.automattic.com/wordpress/trunk@9674 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2008-11-14 02:35:02 +00:00
ryan
7699e2d46b Set eol-style 
git-svn-id: http://svn.automattic.com/wordpress/trunk@9375 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2008-10-28 04:19:39 +00:00
azaozz
cfc2109116 Update TinyMCE to 3.2.0 and remove compression, fixes #7827 
git-svn-id: http://svn.automattic.com/wordpress/trunk@9064 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2008-10-02 16:30:14 +00:00
ryan
d3b414932c Collapse crazyhorse to trunk. Incoming! see #7552 
git-svn-id: http://svn.automattic.com/wordpress/trunk@8691 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2008-08-20 21:42:31 +00:00
azaozz
0c4dbbadca When not using image captions, IE may add caption null, for 2.7 
git-svn-id: http://svn.automattic.com/wordpress/trunk@8517 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2008-08-01 05:10:27 +00:00
azaozz
fddd74d5b9 Latest TinyMCE, has new load options and bugfixes. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@8512 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2008-07-31 04:01:30 +00:00
azaozz
99fd979933 Removes the disabling of captions, but leaves couple of hooks so a plugin can do it easily. see #6812 
git-svn-id: http://svn.automattic.com/wordpress/trunk@8358 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2008-07-16 21:36:17 +00:00
azaozz
d726af852a fixes #7311 for trunk. 
git-svn-id: http://svn.automattic.com/wordpress/trunk@8356 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2008-07-16 20:34:46 +00:00
ryan
752b0eb45b Rename wp_caption shortcode to caption. Allow themes to disable captioning. Use dashes instead of underscores in class names. Props azaozz. see #6812 
git-svn-id: http://svn.automattic.com/wordpress/trunk@8313 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2008-07-11 15:59:14 +00:00
ryan
0022c2c510 Fix image resizing inside captions, add edit alt field to the advanced tab. Props azaozz. see #6812 
git-svn-id: http://svn.automattic.com/wordpress/trunk@8307 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2008-07-10 16:39:14 +00:00