Skip to content

Commit

Permalink
Added version 4.9.7 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
ephox committed Dec 19, 2019
1 parent 202ca07 commit e14935a
Show file tree
Hide file tree
Showing 27 changed files with 589 additions and 1,079 deletions.
4 changes: 4 additions & 0 deletions changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Version 4.9.7 (2019-12-19)
Fixed the `visualchars` plugin converting HTML-like text to DOM elements in certain cases #TINY-4507
Fixed an issue with the `paste` plugin not sanitizing content in some cases #TINY-4510
Fixed HTML comments incorrectly being parsed in certain cases #TINY-4511
Version 4.9.6 (2019-09-02)
Fixed image browse button sometimes displaying the browse window twice #TINY-3959
Version 4.9.5 (2019-07-02)
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tinymce/tinymce",
"version": "4.9.6",
"version": "4.9.7",
"description": "Web based JavaScript HTML WYSIWYG editor control.",
"license": [
"LGPL-2.1-only"
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tinymce",
"version": "4.9.6",
"version": "4.9.7",
"repository": {
"type": "git",
"url": "https://github.com/tinymce/tinymce-dist.git"
Expand Down
93 changes: 30 additions & 63 deletions plugins/help/plugin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ var help = (function () {

var global = tinymce.util.Tools.resolve('tinymce.PluginManager');

var noop = function () {
};
var constant = function (value) {
return function () {
return value;
Expand Down Expand Up @@ -35,8 +37,6 @@ var help = (function () {
var never = constant(false);
var always = constant(true);

var never$1 = never;
var always$1 = always;
var none = function () {
return NONE;
};
Expand All @@ -50,37 +50,27 @@ var help = (function () {
var id = function (n) {
return n;
};
var noop = function () {
};
var nul = function () {
return null;
};
var undef = function () {
return undefined;
};
var me = {
fold: function (n, s) {
return n();
},
is: never$1,
isSome: never$1,
isNone: always$1,
is: never,
isSome: never,
isNone: always,
getOr: id,
getOrThunk: call,
getOrDie: function (msg) {
throw new Error(msg || 'error: getOrDie called on none.');
},
getOrNull: nul,
getOrUndefined: undef,
getOrNull: constant(null),
getOrUndefined: constant(undefined),
or: id,
orThunk: call,
map: none,
ap: none,
each: noop,
bind: none,
flatten: none,
exists: never$1,
forall: always$1,
exists: never,
forall: always,
filter: none,
equals: eq,
equals_: eq,
Expand All @@ -95,15 +85,10 @@ var help = (function () {
return me;
}();
var some = function (a) {
var constant_a = function () {
return a;
};
var constant_a = constant(a);
var self = function () {
return me;
};
var map = function (f) {
return some(f(a));
};
var bind = function (f) {
return f(a);
};
Expand All @@ -114,44 +99,40 @@ var help = (function () {
is: function (v) {
return a === v;
},
isSome: always$1,
isNone: never$1,
isSome: always,
isNone: never,
getOr: constant_a,
getOrThunk: constant_a,
getOrDie: constant_a,
getOrNull: constant_a,
getOrUndefined: constant_a,
or: self,
orThunk: self,
map: map,
ap: function (optfab) {
return optfab.fold(none, function (fab) {
return some(fab(a));
});
map: function (f) {
return some(f(a));
},
each: function (f) {
f(a);
},
bind: bind,
flatten: constant_a,
exists: bind,
forall: bind,
filter: function (f) {
return f(a) ? me : NONE;
},
toArray: function () {
return [a];
},
toString: function () {
return 'some(' + a + ')';
},
equals: function (o) {
return o.is(a);
},
equals_: function (o, elementEq) {
return o.fold(never$1, function (b) {
return o.fold(never, function (b) {
return elementEq(a, b);
});
},
toArray: function () {
return [a];
},
toString: function () {
return 'some(' + a + ')';
}
};
return me;
Expand Down Expand Up @@ -185,17 +166,11 @@ var help = (function () {
};
var isFunction = isType('function');

var slice = Array.prototype.slice;
var rawIndexOf = function () {
var pIndexOf = Array.prototype.indexOf;
var fastIndex = function (xs, x) {
return pIndexOf.call(xs, x);
};
var slowIndex = function (xs, x) {
return slowIndexOf(xs, x);
};
return pIndexOf === undefined ? slowIndex : fastIndex;
}();
var nativeSlice = Array.prototype.slice;
var nativeIndexOf = Array.prototype.indexOf;
var rawIndexOf = function (ts, t) {
return nativeIndexOf.call(ts, t);
};
var contains = function (xs, x) {
return rawIndexOf(xs, x) > -1;
};
Expand All @@ -204,15 +179,15 @@ var help = (function () {
var r = new Array(len);
for (var i = 0; i < len; i++) {
var x = xs[i];
r[i] = f(x, i, xs);
r[i] = f(x, i);
}
return r;
};
var filter = function (xs, pred) {
var r = [];
for (var i = 0, len = xs.length; i < len; i++) {
var x = xs[i];
if (pred(x, i, xs)) {
if (pred(x, i)) {
r.push(x);
}
}
Expand All @@ -221,22 +196,14 @@ var help = (function () {
var find = function (xs, pred) {
for (var i = 0, len = xs.length; i < len; i++) {
var x = xs[i];
if (pred(x, i, xs)) {
if (pred(x, i)) {
return Option.some(x);
}
}
return Option.none();
};
var slowIndexOf = function (xs, x) {
for (var i = 0, len = xs.length; i < len; ++i) {
if (xs[i] === x) {
return i;
}
}
return -1;
};
var from$1 = isFunction(Array.from) ? Array.from : function (x) {
return slice.call(x);
return nativeSlice.call(x);
};

var global$1 = tinymce.util.Tools.resolve('tinymce.util.I18n');
Expand Down
2 changes: 1 addition & 1 deletion plugins/help/plugin.min.js
View file

Large diffs are not rendered by default.

67 changes: 24 additions & 43 deletions plugins/imagetools/plugin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ var imagetools = (function (domGlobals) {

var global$1 = tinymce.util.Tools.resolve('tinymce.util.Tools');

var noop = function () {
};
var constant = function (value) {
return function () {
return value;
Expand All @@ -46,8 +48,6 @@ var imagetools = (function (domGlobals) {
var never = constant(false);
var always = constant(true);

var never$1 = never;
var always$1 = always;
var none = function () {
return NONE;
};
Expand All @@ -61,37 +61,27 @@ var imagetools = (function (domGlobals) {
var id = function (n) {
return n;
};
var noop = function () {
};
var nul = function () {
return null;
};
var undef = function () {
return undefined;
};
var me = {
fold: function (n, s) {
return n();
},
is: never$1,
isSome: never$1,
isNone: always$1,
is: never,
isSome: never,
isNone: always,
getOr: id,
getOrThunk: call,
getOrDie: function (msg) {
throw new Error(msg || 'error: getOrDie called on none.');
},
getOrNull: nul,
getOrUndefined: undef,
getOrNull: constant(null),
getOrUndefined: constant(undefined),
or: id,
orThunk: call,
map: none,
ap: none,
each: noop,
bind: none,
flatten: none,
exists: never$1,
forall: always$1,
exists: never,
forall: always,
filter: none,
equals: eq,
equals_: eq,
Expand All @@ -106,15 +96,10 @@ var imagetools = (function (domGlobals) {
return me;
}();
var some = function (a) {
var constant_a = function () {
return a;
};
var constant_a = constant(a);
var self = function () {
return me;
};
var map = function (f) {
return some(f(a));
};
var bind = function (f) {
return f(a);
};
Expand All @@ -125,44 +110,40 @@ var imagetools = (function (domGlobals) {
is: function (v) {
return a === v;
},
isSome: always$1,
isNone: never$1,
isSome: always,
isNone: never,
getOr: constant_a,
getOrThunk: constant_a,
getOrDie: constant_a,
getOrNull: constant_a,
getOrUndefined: constant_a,
or: self,
orThunk: self,
map: map,
ap: function (optfab) {
return optfab.fold(none, function (fab) {
return some(fab(a));
});
map: function (f) {
return some(f(a));
},
each: function (f) {
f(a);
},
bind: bind,
flatten: constant_a,
exists: bind,
forall: bind,
filter: function (f) {
return f(a) ? me : NONE;
},
toArray: function () {
return [a];
},
toString: function () {
return 'some(' + a + ')';
},
equals: function (o) {
return o.is(a);
},
equals_: function (o, elementEq) {
return o.fold(never$1, function (b) {
return o.fold(never, function (b) {
return elementEq(a, b);
});
},
toArray: function () {
return [a];
},
toString: function () {
return 'some(' + a + ')';
}
};
return me;
Expand Down Expand Up @@ -2586,18 +2567,18 @@ var imagetools = (function (domGlobals) {
};
var isFunction = isType('function');

var slice = Array.prototype.slice;
var nativeSlice = Array.prototype.slice;
var find = function (xs, pred) {
for (var i = 0, len = xs.length; i < len; i++) {
var x = xs[i];
if (pred(x, i, xs)) {
if (pred(x, i)) {
return Option.some(x);
}
}
return Option.none();
};
var from$1 = isFunction(Array.from) ? Array.from : function (x) {
return slice.call(x);
return nativeSlice.call(x);
};

function FileReader () {
Expand Down
2 changes: 1 addition & 1 deletion plugins/imagetools/plugin.min.js
View file

Large diffs are not rendered by default.

Loading

0 comments on commit e14935a

Please sign in to comment.