update to tinyMce 4.0.2
This commit is contained in:
parent
67b57129fa
commit
0eb1812bcd
|
@ -0,0 +1 @@
|
||||||
|
*.less
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 3.9 KiB |
|
@ -1000,7 +1000,12 @@ define("tinymce/Editor", [
|
||||||
|
|
||||||
// Focus the window iframe
|
// Focus the window iframe
|
||||||
if (!contentEditable) {
|
if (!contentEditable) {
|
||||||
self.getBody().focus(); // WebKit needs this call to fire focusin event properly see #5948
|
// WebKit needs this call to fire focusin event properly see #5948
|
||||||
|
// But Opera pre Blink engine will produce an empty selection so skip Opera
|
||||||
|
if (!Env.opera) {
|
||||||
|
self.getBody().focus();
|
||||||
|
}
|
||||||
|
|
||||||
self.getWin().focus();
|
self.getWin().focus();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
11
copy_this/modules/hdi/hdi-tinymce/tinymce/classes/dom/ControlSelection.js
Executable file → Normal file
11
copy_this/modules/hdi/hdi-tinymce/tinymce/classes/dom/ControlSelection.js
Executable file → Normal file
|
@ -25,6 +25,7 @@ define("tinymce/dom/ControlSelection", [
|
||||||
var selectedElm, selectedElmGhost, resizeHandles, selectedHandle;
|
var selectedElm, selectedElmGhost, resizeHandles, selectedHandle;
|
||||||
var startX, startY, selectedElmX, selectedElmY, startW, startH, ratio, resizeStarted;
|
var startX, startY, selectedElmX, selectedElmY, startW, startH, ratio, resizeStarted;
|
||||||
var width, height, editableDoc = editor.getDoc(), rootDocument = document, isIE = Env.ie;
|
var width, height, editableDoc = editor.getDoc(), rootDocument = document, isIE = Env.ie;
|
||||||
|
var lastMouseDownEvent;
|
||||||
|
|
||||||
// Details about each resize handle how to scale etc
|
// Details about each resize handle how to scale etc
|
||||||
resizeHandles = {
|
resizeHandles = {
|
||||||
|
@ -339,8 +340,8 @@ define("tinymce/dom/ControlSelection", [
|
||||||
var target = e.srcElement, pos, name, corner, cornerX, cornerY, relativeX, relativeY;
|
var target = e.srcElement, pos, name, corner, cornerX, cornerY, relativeX, relativeY;
|
||||||
|
|
||||||
pos = target.getBoundingClientRect();
|
pos = target.getBoundingClientRect();
|
||||||
relativeX = e.clientX - pos.left;
|
relativeX = lastMouseDownEvent.clientX - pos.left;
|
||||||
relativeY = e.clientY - pos.top;
|
relativeY = lastMouseDownEvent.clientY - pos.top;
|
||||||
|
|
||||||
// Figure out what corner we are draging on
|
// Figure out what corner we are draging on
|
||||||
for (name in resizeHandles) {
|
for (name in resizeHandles) {
|
||||||
|
@ -358,7 +359,7 @@ define("tinymce/dom/ControlSelection", [
|
||||||
// Remove native selection and let the magic begin
|
// Remove native selection and let the magic begin
|
||||||
resizeStarted = true;
|
resizeStarted = true;
|
||||||
editor.getDoc().selection.empty();
|
editor.getDoc().selection.empty();
|
||||||
showResizeRect(target, name, e);
|
showResizeRect(target, name, lastMouseDownEvent);
|
||||||
}
|
}
|
||||||
|
|
||||||
function nativeControlSelect(e) {
|
function nativeControlSelect(e) {
|
||||||
|
@ -422,6 +423,10 @@ define("tinymce/dom/ControlSelection", [
|
||||||
});
|
});
|
||||||
|
|
||||||
attachEvent(editor.getBody(), 'controlselect', nativeControlSelect);
|
attachEvent(editor.getBody(), 'controlselect', nativeControlSelect);
|
||||||
|
|
||||||
|
editor.on('mousedown', function(e) {
|
||||||
|
lastMouseDownEvent = e;
|
||||||
|
});
|
||||||
} else {
|
} else {
|
||||||
disableGeckoResize();
|
disableGeckoResize();
|
||||||
}
|
}
|
||||||
|
|
0
copy_this/modules/hdi/hdi-tinymce/tinymce/classes/dom/ScriptLoader.js
Executable file → Normal file
0
copy_this/modules/hdi/hdi-tinymce/tinymce/classes/dom/ScriptLoader.js
Executable file → Normal file
0
copy_this/modules/hdi/hdi-tinymce/tinymce/classes/dom/Sizzle.jQuery.js
Executable file → Normal file
0
copy_this/modules/hdi/hdi-tinymce/tinymce/classes/dom/Sizzle.jQuery.js
Executable file → Normal file
0
copy_this/modules/hdi/hdi-tinymce/tinymce/classes/dom/TridentSelection.js
Executable file → Normal file
0
copy_this/modules/hdi/hdi-tinymce/tinymce/classes/dom/TridentSelection.js
Executable file → Normal file
0
copy_this/modules/hdi/hdi-tinymce/tinymce/classes/html/Serializer.js
Executable file → Normal file
0
copy_this/modules/hdi/hdi-tinymce/tinymce/classes/html/Serializer.js
Executable file → Normal file
0
copy_this/modules/hdi/hdi-tinymce/tinymce/classes/ui/AbsoluteLayout.js
Executable file → Normal file
0
copy_this/modules/hdi/hdi-tinymce/tinymce/classes/ui/AbsoluteLayout.js
Executable file → Normal file
0
copy_this/modules/hdi/hdi-tinymce/tinymce/classes/ui/FormatControls.js
Executable file → Normal file
0
copy_this/modules/hdi/hdi-tinymce/tinymce/classes/ui/FormatControls.js
Executable file → Normal file
0
copy_this/modules/hdi/hdi-tinymce/tinymce/classes/ui/KeyboardNavigation.js
Executable file → Normal file
0
copy_this/modules/hdi/hdi-tinymce/tinymce/classes/ui/KeyboardNavigation.js
Executable file → Normal file
|
@ -191,6 +191,7 @@ define("tinymce/ui/MenuButton", [
|
||||||
});
|
});
|
||||||
|
|
||||||
if (hasVisibleSiblingMenu) {
|
if (hasVisibleSiblingMenu) {
|
||||||
|
overCtrl.focus(); // Fix for: #5887
|
||||||
overCtrl.showMenu();
|
overCtrl.showMenu();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
0
copy_this/modules/hdi/hdi-tinymce/tinymce/classes/ui/ResizeHandle.js
Executable file → Normal file
0
copy_this/modules/hdi/hdi-tinymce/tinymce/classes/ui/ResizeHandle.js
Executable file → Normal file
0
copy_this/modules/hdi/hdi-tinymce/tinymce/classes/util/JSONRequest.js
Executable file → Normal file
0
copy_this/modules/hdi/hdi-tinymce/tinymce/classes/util/JSONRequest.js
Executable file → Normal file
0
copy_this/modules/hdi/hdi-tinymce/tinymce/classes/util/LocalStorage.js
Executable file → Normal file
0
copy_this/modules/hdi/hdi-tinymce/tinymce/classes/util/LocalStorage.js
Executable file → Normal file
0
copy_this/modules/hdi/hdi-tinymce/tinymce/classes/util/Observable.js
Executable file → Normal file
0
copy_this/modules/hdi/hdi-tinymce/tinymce/classes/util/Observable.js
Executable file → Normal file
|
@ -320,7 +320,7 @@ define("tinymce/util/Quirks", [
|
||||||
selection.getSel().setBaseAndExtent(e, 0, e, 1);
|
selection.getSel().setBaseAndExtent(e, 0, e, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (e.nodeName == 'A' && dom.hasClass(e, 'mceItemAnchor')) {
|
if (e.nodeName == 'A' && dom.hasClass(e, 'mce-item-anchor')) {
|
||||||
selection.select(e);
|
selection.select(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue