Skip to content

Commit

Permalink
Upgraded bundled TinyMCE to version 3.2.7
Browse files Browse the repository at this point in the history
  • Loading branch information
trevorrowe committed Oct 2, 2009
1 parent 2eb2221 commit f94d456
Show file tree
Hide file tree
Showing 11 changed files with 279 additions and 116 deletions.
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
/**
* $Id: editor_plugin_src.js 539 2008-01-14 19:08:58Z spocke $
*
* @author Moxiecode
* @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
*/
* $Id: editor_plugin_src.js 539 2008-01-14 19:08:58Z spocke $
*
* @author Moxiecode
* @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
*/

(function() {
/**
* Auto Resize
*
* This plugin automatically resizes the content area to fit its content height.
* It will retain a minimum height, which is the height of the content area when
* it's initialized.
*/
* Auto Resize
*
* This plugin automatically resizes the content area to fit its content height.
* It will retain a minimum height, which is the height of the content area when
* it's initialized.
*/
tinymce.create('tinymce.plugins.AutoResizePlugin', {
/**
* Initializes the plugin, this will be executed after the plugin has been created.
* This call is done before the editor instance has finished it's initialization so use the onInit event
* of the editor instance to intercept that event.
*
* @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
* @param {string} url Absolute URL to where the plugin is located.
*/
* Initializes the plugin, this will be executed after the plugin has been created.
* This call is done before the editor instance has finished it's initialization so use the onInit event
* of the editor instance to intercept that event.
*
* @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
* @param {string} url Absolute URL to where the plugin is located.
*/
init : function(ed, url) {
var t = this;

Expand Down Expand Up @@ -93,11 +93,11 @@
},

/**
* Returns information about the plugin as a name/value array.
* The current keys are longname, author, authorurl, infourl and version.
*
* @return {Object} Name/value array containing information about the plugin.
*/
* Returns information about the plugin as a name/value array.
* The current keys are longname, author, authorurl, infourl and version.
*
* @return {Object} Name/value array containing information about the plugin.
*/
getInfo : function() {
return {
longname : 'Auto Resize',
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* $Id: editor_plugin_src.js 1037 2009-03-02 16:41:15Z spocke $
* $Id: editor_plugin_src.js 1222 2009-09-03 17:26:47Z spocke $
*
* @author Moxiecode
* @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
Expand Down Expand Up @@ -61,7 +61,7 @@
if (ed.settings.content_css !== false)
ed.dom.loadCSS(url + "/css/content.css");

if (ed.theme.onResolveName) {
if (ed.theme && ed.theme.onResolveName) {
ed.theme.onResolveName.add(function(th, o) {
if (o.name == 'img') {
each(lo, function(v, k) {
Expand Down Expand Up @@ -341,7 +341,7 @@
_createImg : function(cl, n) {
var im, dom = this.editor.dom, pa = {}, ti = '', args;

args = ['id', 'name', 'width', 'height', 'bgcolor', 'align', 'flashvars', 'src', 'wmode', 'allowfullscreen', 'quality'];
args = ['id', 'name', 'width', 'height', 'bgcolor', 'align', 'flashvars', 'src', 'wmode', 'allowfullscreen', 'quality', 'data'];

// Create image
im = dom.create('img', {
Expand Down Expand Up @@ -372,6 +372,12 @@
delete pa.movie;
}

// No src try data
if (!pa.src) {
pa.src = pa.data;
delete pa.data;
}

// Merge with embed args
n = dom.select('.mceItemEmbed', n)[0];
if (n) {
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit f94d456

Please sign in to comment.