git-svn-id: https://develop.svn.wordpress.org/trunk@30675 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz
2014-11-30 23:27:23 +00:00
parent 0632a3de68
commit 45f4403dd0
13 changed files with 145 additions and 31 deletions

View File

@@ -228,6 +228,15 @@ tinymce.PluginManager.add('image', function(editor) {
});
if (!meta.width && !meta.height) {
var srcURL = this.value(),
absoluteURLPattern = new RegExp('^(?:[a-z]+:)?//', 'i'),
baseURL = editor.settings.document_base_url;
//Pattern test the src url and make sure we haven't already prepended the url
if (baseURL && !absoluteURLPattern.test(srcURL) && srcURL.substring(0, baseURL.length) !== baseURL) {
this.value(baseURL + srcURL);
}
getImageSize(this.value(), function(data) {
if (data.width && data.height && imageDimensions) {
width = data.width;

File diff suppressed because one or more lines are too long

View File

@@ -1331,7 +1331,9 @@ define("tinymce/pasteplugin/WordFilter", [
var rootNode = domParser.parse(content);
// Process DOM
convertFakeListsToProperLists(rootNode);
if (settings.paste_convert_word_fake_lists !== false) {
convertFakeListsToProperLists(rootNode);
}
// Serialize DOM back to HTML
e.content = new Serializer({}, schema).serialize(rootNode);

File diff suppressed because one or more lines are too long

View File

@@ -1,4 +1,4 @@
// 4.1.6 (2014-11-19)
// 4.1.7 (2014-11-27)
/**
* Compiled inline version. (Library mode)
@@ -2996,18 +2996,18 @@ define("tinymce/util/Tools", [
* one array list into another.
*
* @method map
* @param {Array} a Array of items to iterate.
* @param {function} f Function to call for each item. It's return value will be the new value.
* @param {Array} array Array of items to iterate.
* @param {function} callback Function to call for each item. It's return value will be the new value.
* @return {Array} Array with new values based on function return values.
*/
function map(a, f) {
var o = [];
function map(array, callback) {
var out = [];
each(a, function(v) {
o.push(f(v));
each(array, function(item) {
out.push(callback(item));
});
return o;
return out;
}
/**
@@ -13700,7 +13700,7 @@ define("tinymce/util/VK", [
UP: 38,
modifierPressed: function(e) {
return e.shiftKey || e.ctrlKey || e.altKey;
return e.shiftKey || e.ctrlKey || e.altKey || this.metaKeyPressed(e);
},
metaKeyPressed: function(e) {
@@ -18298,10 +18298,11 @@ define("tinymce/Formatter", [
* @class tinymce.UndoManager
*/
define("tinymce/UndoManager", [
"tinymce/util/VK",
"tinymce/Env",
"tinymce/util/Tools",
"tinymce/html/SaxParser"
], function(Env, Tools, SaxParser) {
], function(VK, Env, Tools, SaxParser) {
var trim = Tools.trim, trimContentRegExp;
trimContentRegExp = new RegExp([
@@ -18426,7 +18427,8 @@ define("tinymce/UndoManager", [
}
// If key isn't shift,ctrl,alt,capslock,metakey
if ((keyCode < 16 || keyCode > 20) && keyCode != 224 && keyCode != 91 && !self.typing) {
var modKey = VK.modifierPressed(e);
if ((keyCode < 16 || keyCode > 20) && keyCode != 224 && keyCode != 91 && !self.typing && !modKey) {
self.beforeChange();
self.typing = true;
self.add({}, e);
@@ -30750,7 +30752,7 @@ define("tinymce/EditorManager", [
* @property minorVersion
* @type String
*/
minorVersion: '1.6',
minorVersion: '1.7',
/**
* Release date of TinyMCE build.
@@ -30758,7 +30760,7 @@ define("tinymce/EditorManager", [
* @property releaseDate
* @type String
*/
releaseDate: '2014-11-19',
releaseDate: '2014-11-27',
/**
* Collection of editor instances.

File diff suppressed because one or more lines are too long

View File

@@ -18,7 +18,7 @@ $wp_db_version = 30133;
*
* @global string $tinymce_version
*/
$tinymce_version = '4106-20141119';
$tinymce_version = '4107-20141130';
/**
* Holds the required PHP version