tinymce-rails 4.2.7 → 4.2.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/source/tinymce/tinymce.jquery.js +180 -173
- data/app/assets/source/tinymce/tinymce.js +180 -173
- data/lib/tinymce/rails/version.rb +2 -2
- data/vendor/assets/javascripts/tinymce/plugins/table/plugin.js +1 -1
- data/vendor/assets/javascripts/tinymce/tinymce.jquery.js +8 -8
- data/vendor/assets/javascripts/tinymce/tinymce.js +9 -9
- metadata +4 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 35668f61d133a4d65feaf8a52b72d96c088b094e
|
4
|
+
data.tar.gz: bef84a9127a251c4a52df68b8700904d20f322b2
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ec243cd265069faca4c6d894859d27c2860dabce310bef8db55878191db5172da756d48bbd227a0525be35614195cb838c78ffdda4b5339b3da7ca59cca13074
|
7
|
+
data.tar.gz: 155f07a00661be566775c7879a48fbba2cf4dd6ae72b873719f57c751971b4d39a2a5814cb272b13a41aff32f638d27a7af5b24782614a1ca989e6764a80f971
|
@@ -1,4 +1,4 @@
|
|
1
|
-
// 4.2.
|
1
|
+
// 4.2.8 (2015-11-13)
|
2
2
|
|
3
3
|
/**
|
4
4
|
* Compiled inline version. (Library mode)
|
@@ -433,7 +433,7 @@ define("tinymce/dom/EventUtils", [], function() {
|
|
433
433
|
}
|
434
434
|
}
|
435
435
|
|
436
|
-
// Fake
|
436
|
+
// Fake bubbling of focusin/focusout
|
437
437
|
if (!hasFocusIn && (name === "focusin" || name === "focusout")) {
|
438
438
|
capture = true;
|
439
439
|
fakeName = name === "focusin" ? "focus" : "blur";
|
@@ -618,7 +618,7 @@ define("tinymce/dom/EventUtils", [], function() {
|
|
618
618
|
return self;
|
619
619
|
}
|
620
620
|
|
621
|
-
// Unbind any element on the
|
621
|
+
// Unbind any element on the specified target
|
622
622
|
if (target[expando]) {
|
623
623
|
unbind(target);
|
624
624
|
}
|
@@ -1757,7 +1757,7 @@ define("tinymce/dom/DomQuery", [
|
|
1757
1757
|
* Converts the current set to an array.
|
1758
1758
|
*
|
1759
1759
|
* @method toArray
|
1760
|
-
* @
|
1760
|
+
* @return {Array} Array of all nodes in set.
|
1761
1761
|
*/
|
1762
1762
|
toArray: function() {
|
1763
1763
|
return Tools.toArray(this);
|
@@ -1768,6 +1768,7 @@ define("tinymce/dom/DomQuery", [
|
|
1768
1768
|
*
|
1769
1769
|
* @method add
|
1770
1770
|
* @param {Array/tinymce.dom.DomQuery} items Array of all nodes to add to set.
|
1771
|
+
* @param {Boolean} sort
|
1771
1772
|
* @return {tinymce.dom.DomQuery} New instance with nodes added.
|
1772
1773
|
*/
|
1773
1774
|
add: function(items, sort) {
|
@@ -2180,8 +2181,8 @@ define("tinymce/dom/DomQuery", [
|
|
2180
2181
|
* @param {String/Element/Array/tinymce.dom.DomQuery} content Content to wrap nodes with.
|
2181
2182
|
* @return {tinymce.dom.DomQuery} Set with wrapped nodes.
|
2182
2183
|
*/
|
2183
|
-
wrap: function(
|
2184
|
-
return wrap(this,
|
2184
|
+
wrap: function(content) {
|
2185
|
+
return wrap(this, content);
|
2185
2186
|
},
|
2186
2187
|
|
2187
2188
|
/**
|
@@ -2192,8 +2193,8 @@ define("tinymce/dom/DomQuery", [
|
|
2192
2193
|
* @param {String/Element/Array/tinymce.dom.DomQuery} content Content to wrap nodes with.
|
2193
2194
|
* @return {tinymce.dom.DomQuery} Set with wrapped nodes.
|
2194
2195
|
*/
|
2195
|
-
wrapAll: function(
|
2196
|
-
return wrap(this,
|
2196
|
+
wrapAll: function(content) {
|
2197
|
+
return wrap(this, content, true);
|
2197
2198
|
},
|
2198
2199
|
|
2199
2200
|
/**
|
@@ -2203,9 +2204,9 @@ define("tinymce/dom/DomQuery", [
|
|
2203
2204
|
* @param {String/Element/Array/tinymce.dom.DomQuery} content Content to wrap nodes with.
|
2204
2205
|
* @return {tinymce.dom.DomQuery} Set with wrapped nodes.
|
2205
2206
|
*/
|
2206
|
-
wrapInner: function(
|
2207
|
+
wrapInner: function(content) {
|
2207
2208
|
this.each(function() {
|
2208
|
-
DomQuery(this).contents().wrapAll(
|
2209
|
+
DomQuery(this).contents().wrapAll(content);
|
2209
2210
|
});
|
2210
2211
|
|
2211
2212
|
return this;
|
@@ -2394,7 +2395,7 @@ define("tinymce/dom/DomQuery", [
|
|
2394
2395
|
*
|
2395
2396
|
* @method slice
|
2396
2397
|
* @param {Number} start Start index to slice at.
|
2397
|
-
* @param {Number} end Optional
|
2398
|
+
* @param {Number} end Optional end index to end slice at.
|
2398
2399
|
* @return {tinymce.dom.DomQuery} Sliced set.
|
2399
2400
|
*/
|
2400
2401
|
slice: function() {
|
@@ -2467,7 +2468,7 @@ define("tinymce/dom/DomQuery", [
|
|
2467
2468
|
},
|
2468
2469
|
|
2469
2470
|
/**
|
2470
|
-
* Gets the current node or any
|
2471
|
+
* Gets the current node or any parent matching the specified selector.
|
2471
2472
|
*
|
2472
2473
|
* @method closest
|
2473
2474
|
* @param {String/Element/tinymce.dom.DomQuery} selector Selector or element to find.
|
@@ -2555,14 +2556,14 @@ define("tinymce/dom/DomQuery", [
|
|
2555
2556
|
* @static
|
2556
2557
|
* @method makeArray
|
2557
2558
|
* @param {Object} object Object to convert to array.
|
2558
|
-
* @return {
|
2559
|
+
* @return {Array} Array produced from object.
|
2559
2560
|
*/
|
2560
|
-
makeArray: function(
|
2561
|
-
if (isWindow(
|
2562
|
-
return [
|
2561
|
+
makeArray: function(object) {
|
2562
|
+
if (isWindow(object) || object.nodeType) {
|
2563
|
+
return [object];
|
2563
2564
|
}
|
2564
2565
|
|
2565
|
-
return Tools.toArray(
|
2566
|
+
return Tools.toArray(object);
|
2566
2567
|
},
|
2567
2568
|
|
2568
2569
|
/**
|
@@ -2722,7 +2723,7 @@ define("tinymce/dom/DomQuery", [
|
|
2722
2723
|
* Returns a new collection with the parent of each item in current collection matching the optional selector.
|
2723
2724
|
*
|
2724
2725
|
* @method parent
|
2725
|
-
* @param {
|
2726
|
+
* @param {Element/tinymce.dom.DomQuery} node Node to match parents against.
|
2726
2727
|
* @return {tinymce.dom.DomQuery} New DomQuery instance with all matching parents.
|
2727
2728
|
*/
|
2728
2729
|
parent: function(node) {
|
@@ -2735,7 +2736,7 @@ define("tinymce/dom/DomQuery", [
|
|
2735
2736
|
* Returns a new collection with the all the parents of each item in current collection matching the optional selector.
|
2736
2737
|
*
|
2737
2738
|
* @method parents
|
2738
|
-
* @param {
|
2739
|
+
* @param {Element/tinymce.dom.DomQuery} node Node to match parents against.
|
2739
2740
|
* @return {tinymce.dom.DomQuery} New DomQuery instance with all matching parents.
|
2740
2741
|
*/
|
2741
2742
|
parents: function(node) {
|
@@ -2746,7 +2747,7 @@ define("tinymce/dom/DomQuery", [
|
|
2746
2747
|
* Returns a new collection with next sibling of each item in current collection matching the optional selector.
|
2747
2748
|
*
|
2748
2749
|
* @method next
|
2749
|
-
* @param {
|
2750
|
+
* @param {Element/tinymce.dom.DomQuery} node Node to match the next element against.
|
2750
2751
|
* @return {tinymce.dom.DomQuery} New DomQuery instance with all matching elements.
|
2751
2752
|
*/
|
2752
2753
|
next: function(node) {
|
@@ -2757,7 +2758,7 @@ define("tinymce/dom/DomQuery", [
|
|
2757
2758
|
* Returns a new collection with previous sibling of each item in current collection matching the optional selector.
|
2758
2759
|
*
|
2759
2760
|
* @method prev
|
2760
|
-
* @param {
|
2761
|
+
* @param {Element/tinymce.dom.DomQuery} node Node to match the previous element against.
|
2761
2762
|
* @return {tinymce.dom.DomQuery} New DomQuery instance with all matching elements.
|
2762
2763
|
*/
|
2763
2764
|
prev: function(node) {
|
@@ -2768,7 +2769,7 @@ define("tinymce/dom/DomQuery", [
|
|
2768
2769
|
* Returns all child elements matching the optional selector.
|
2769
2770
|
*
|
2770
2771
|
* @method children
|
2771
|
-
* @param {
|
2772
|
+
* @param {Element/tinymce.dom.DomQuery} node Node to match the elements against.
|
2772
2773
|
* @return {tinymce.dom.DomQuery} New DomQuery instance with all matching elements.
|
2773
2774
|
*/
|
2774
2775
|
children: function(node) {
|
@@ -2779,6 +2780,7 @@ define("tinymce/dom/DomQuery", [
|
|
2779
2780
|
* Returns all child nodes matching the optional selector.
|
2780
2781
|
*
|
2781
2782
|
* @method contents
|
2783
|
+
* @param {Element/tinymce.dom.DomQuery} node
|
2782
2784
|
* @return {tinymce.dom.DomQuery} New DomQuery instance with all matching elements.
|
2783
2785
|
*/
|
2784
2786
|
contents: function(node) {
|
@@ -2827,6 +2829,7 @@ define("tinymce/dom/DomQuery", [
|
|
2827
2829
|
* of each item in current collection matching the optional selector.
|
2828
2830
|
*
|
2829
2831
|
* @method parentsUntil
|
2832
|
+
* @param {Element/tinymce.dom.DomQuery} node
|
2830
2833
|
* @param {String/Element/tinymce.dom.DomQuery} until Until the matching selector or element.
|
2831
2834
|
* @return {tinymce.dom.DomQuery} New DomQuery instance with all matching parents.
|
2832
2835
|
*/
|
@@ -2838,6 +2841,7 @@ define("tinymce/dom/DomQuery", [
|
|
2838
2841
|
* Returns a new collection with all next siblings of each item in current collection matching the optional selector.
|
2839
2842
|
*
|
2840
2843
|
* @method nextUntil
|
2844
|
+
* @param {Element/tinymce.dom.DomQuery} node
|
2841
2845
|
* @param {String/Element/tinymce.dom.DomQuery} until Until the matching selector or element.
|
2842
2846
|
* @return {tinymce.dom.DomQuery} New DomQuery instance with all matching elements.
|
2843
2847
|
*/
|
@@ -2849,6 +2853,7 @@ define("tinymce/dom/DomQuery", [
|
|
2849
2853
|
* Returns a new collection with all previous siblings of each item in current collection matching the optional selector.
|
2850
2854
|
*
|
2851
2855
|
* @method prevUntil
|
2856
|
+
* @param {Element/tinymce.dom.DomQuery} node
|
2852
2857
|
* @param {String/Element/tinymce.dom.DomQuery} until Until the matching selector or element.
|
2853
2858
|
* @return {tinymce.dom.DomQuery} New DomQuery instance with all matching elements.
|
2854
2859
|
*/
|
@@ -3650,7 +3655,8 @@ define("tinymce/dom/Range", [
|
|
3650
3655
|
function _getSelectedNode(container, offset) {
|
3651
3656
|
var child;
|
3652
3657
|
|
3653
|
-
|
3658
|
+
// TEXT_NODE
|
3659
|
+
if (container.nodeType == 3) {
|
3654
3660
|
return container;
|
3655
3661
|
}
|
3656
3662
|
|
@@ -3884,7 +3890,7 @@ define("tinymce/dom/Range", [
|
|
3884
3890
|
}
|
3885
3891
|
|
3886
3892
|
// Text node needs special case handling
|
3887
|
-
if (self[START_CONTAINER].nodeType == 3
|
3893
|
+
if (self[START_CONTAINER].nodeType == 3) { // TEXT_NODE
|
3888
3894
|
// get the substring
|
3889
3895
|
s = self[START_CONTAINER].nodeValue;
|
3890
3896
|
sub = s.substring(self[START_OFFSET], self[END_OFFSET]);
|
@@ -4161,7 +4167,8 @@ define("tinymce/dom/Range", [
|
|
4161
4167
|
return _traverseFullySelected(n, how);
|
4162
4168
|
}
|
4163
4169
|
|
4164
|
-
|
4170
|
+
// TEXT_NODE
|
4171
|
+
if (n.nodeType == 3) {
|
4165
4172
|
txtValue = n.nodeValue;
|
4166
4173
|
|
4167
4174
|
if (isLeft) {
|
@@ -4844,8 +4851,8 @@ define("tinymce/dom/DOMUtils", [
|
|
4844
4851
|
*
|
4845
4852
|
* @constructor
|
4846
4853
|
* @method DOMUtils
|
4847
|
-
* @param {Document}
|
4848
|
-
* @param {settings}
|
4854
|
+
* @param {Document} doc Document reference to bind the utility class to.
|
4855
|
+
* @param {settings} settings Optional settings collection.
|
4849
4856
|
*/
|
4850
4857
|
function DOMUtils(doc, settings) {
|
4851
4858
|
var self = this, blockElementsMap;
|
@@ -5237,6 +5244,7 @@ define("tinymce/dom/DOMUtils", [
|
|
5237
5244
|
* @param {String/Element} name Name of new element to add or existing element to add.
|
5238
5245
|
* @param {Object} attrs Optional object collection with arguments to add to the new element(s).
|
5239
5246
|
* @param {String} html Optional inner HTML contents to add for each element.
|
5247
|
+
* @param {Boolean} create
|
5240
5248
|
* @return {Element/Array} Element that got created, or an array of created elements if multiple input elements
|
5241
5249
|
* were passed in.
|
5242
5250
|
* @example
|
@@ -5379,9 +5387,9 @@ define("tinymce/dom/DOMUtils", [
|
|
5379
5387
|
* or the CSS style name like background-color.
|
5380
5388
|
*
|
5381
5389
|
* @method setStyle
|
5382
|
-
* @param {String/Element/Array}
|
5383
|
-
* @param {String}
|
5384
|
-
* @param {String}
|
5390
|
+
* @param {String/Element/Array} elm HTML element/Array of elements to set CSS style value on.
|
5391
|
+
* @param {String} name Name of the style value to set.
|
5392
|
+
* @param {String} value Value to set on the style.
|
5385
5393
|
* @example
|
5386
5394
|
* // Sets a style value on all paragraphs in the currently active editor
|
5387
5395
|
* tinymce.activeEditor.dom.setStyle(tinymce.activeEditor.dom.select('p'), 'background-color', 'red');
|
@@ -5429,8 +5437,8 @@ define("tinymce/dom/DOMUtils", [
|
|
5429
5437
|
* Sets multiple styles on the specified element(s).
|
5430
5438
|
*
|
5431
5439
|
* @method setStyles
|
5432
|
-
* @param {Element/String/Array}
|
5433
|
-
* @param {Object}
|
5440
|
+
* @param {Element/String/Array} elm DOM element, element id string or array of elements/ids to set styles on.
|
5441
|
+
* @param {Object} styles Name/Value collection of style items to add to the element(s).
|
5434
5442
|
* @example
|
5435
5443
|
* // Sets styles on all paragraphs in the currently active editor
|
5436
5444
|
* tinymce.activeEditor.dom.setStyles(tinymce.activeEditor.dom.select('p'), {'background-color': 'red', 'color': 'green'});
|
@@ -5465,9 +5473,10 @@ define("tinymce/dom/DOMUtils", [
|
|
5465
5473
|
* Sets the specified attribute of an element or elements.
|
5466
5474
|
*
|
5467
5475
|
* @method setAttrib
|
5468
|
-
* @param {Element/String/Array}
|
5469
|
-
* @param {String}
|
5470
|
-
* @param {String}
|
5476
|
+
* @param {Element/String/Array} elm DOM element, element id string or array of elements/ids to set attribute on.
|
5477
|
+
* @param {String} name Name of attribute to set.
|
5478
|
+
* @param {String} value Value to set on the attribute - if this value is falsy like null, 0 or '' it will remove
|
5479
|
+
* the attribute instead.
|
5471
5480
|
* @example
|
5472
5481
|
* // Sets class attribute on all paragraphs in the active editor
|
5473
5482
|
* tinymce.activeEditor.dom.setAttrib(tinymce.activeEditor.dom.select('p'), 'class', 'myclass');
|
@@ -5680,7 +5689,7 @@ define("tinymce/dom/DOMUtils", [
|
|
5680
5689
|
* Imports/loads the specified CSS file into the document bound to the class.
|
5681
5690
|
*
|
5682
5691
|
* @method loadCSS
|
5683
|
-
* @param {String}
|
5692
|
+
* @param {String} url URL to CSS file to load.
|
5684
5693
|
* @example
|
5685
5694
|
* // Loads a CSS file dynamically into the current document
|
5686
5695
|
* tinymce.DOM.loadCSS('somepath/some.css');
|
@@ -5779,8 +5788,8 @@ define("tinymce/dom/DOMUtils", [
|
|
5779
5788
|
* Returns true if the specified element has the specified class.
|
5780
5789
|
*
|
5781
5790
|
* @method hasClass
|
5782
|
-
* @param {String/Element}
|
5783
|
-
* @param {String}
|
5791
|
+
* @param {String/Element} elm HTML element or element id string to check CSS class on.
|
5792
|
+
* @param {String} cls CSS class to check for.
|
5784
5793
|
* @return {Boolean} true/false if the specified element has the specified class.
|
5785
5794
|
*/
|
5786
5795
|
hasClass: function(elm, cls) {
|
@@ -5817,7 +5826,7 @@ define("tinymce/dom/DOMUtils", [
|
|
5817
5826
|
* Hides the specified element(s) by ID by setting the "display" style.
|
5818
5827
|
*
|
5819
5828
|
* @method hide
|
5820
|
-
* @param {String/Element/Array}
|
5829
|
+
* @param {String/Element/Array} elm ID of DOM element or DOM element or array with elements or IDs to hide.
|
5821
5830
|
* @example
|
5822
5831
|
* // Hides an element by id in the document
|
5823
5832
|
* tinymce.DOM.hide('myid');
|
@@ -5830,7 +5839,7 @@ define("tinymce/dom/DOMUtils", [
|
|
5830
5839
|
* Returns true/false if the element is hidden or not by checking the "display" style.
|
5831
5840
|
*
|
5832
5841
|
* @method isHidden
|
5833
|
-
* @param {String/Element}
|
5842
|
+
* @param {String/Element} elm Id or element to check display state on.
|
5834
5843
|
* @return {Boolean} true/false if the element is hidden or not.
|
5835
5844
|
*/
|
5836
5845
|
isHidden: function(elm) {
|
@@ -5855,7 +5864,7 @@ define("tinymce/dom/DOMUtils", [
|
|
5855
5864
|
*
|
5856
5865
|
* @method setHTML
|
5857
5866
|
* @param {Element/String/Array} elm DOM element, element id string or array of elements/ids to set HTML inside of.
|
5858
|
-
* @param {String}
|
5867
|
+
* @param {String} html HTML content to set as inner HTML of the element.
|
5859
5868
|
* @example
|
5860
5869
|
* // Sets the inner HTML of all paragraphs in the active editor
|
5861
5870
|
* tinymce.activeEditor.dom.setHTML(tinymce.activeEditor.dom.select('p'), 'some inner html');
|
@@ -5917,7 +5926,6 @@ define("tinymce/dom/DOMUtils", [
|
|
5917
5926
|
* @method setOuterHTML
|
5918
5927
|
* @param {Element/String/Array} elm DOM element, element id string or array of elements/ids to set outer HTML on.
|
5919
5928
|
* @param {Object} html HTML code to set as outer value for the element.
|
5920
|
-
* @param {Document} doc Optional document scope to use in this process - defaults to the document of the DOM class.
|
5921
5929
|
* @example
|
5922
5930
|
* // Sets the outer HTML of all paragraphs in the active editor
|
5923
5931
|
* tinymce.activeEditor.dom.setOuterHTML(tinymce.activeEditor.dom.select('p'), '<div>some html</div>');
|
@@ -5930,7 +5938,7 @@ define("tinymce/dom/DOMUtils", [
|
|
5930
5938
|
|
5931
5939
|
self.$$(elm).each(function() {
|
5932
5940
|
try {
|
5933
|
-
// Older FF doesn't have outerHTML 3.6 is still used by some
|
5941
|
+
// Older FF doesn't have outerHTML 3.6 is still used by some organizations
|
5934
5942
|
if ("outerHTML" in this) {
|
5935
5943
|
this.outerHTML = html;
|
5936
5944
|
return;
|
@@ -5967,7 +5975,7 @@ define("tinymce/dom/DOMUtils", [
|
|
5967
5975
|
*
|
5968
5976
|
* @method insertAfter
|
5969
5977
|
* @param {Element} node Element to insert after the reference.
|
5970
|
-
* @param {Element/String/Array}
|
5978
|
+
* @param {Element/String/Array} referenceNode Reference element, element id or array of elements to insert after.
|
5971
5979
|
* @return {Element/Array} Element that got added or an array with elements.
|
5972
5980
|
*/
|
5973
5981
|
insertAfter: function(node, referenceNode) {
|
@@ -5995,8 +6003,9 @@ define("tinymce/dom/DOMUtils", [
|
|
5995
6003
|
*
|
5996
6004
|
* @method replace
|
5997
6005
|
* @param {Element} newElm New element to replace old ones with.
|
5998
|
-
* @param {Element/String/Array}
|
5999
|
-
* @param {Boolean}
|
6006
|
+
* @param {Element/String/Array} oldElm Element DOM node, element id or array of elements or ids to replace.
|
6007
|
+
* @param {Boolean} keepChildren Optional keep children state, if set to true child nodes from the old object will be added
|
6008
|
+
* to new ones.
|
6000
6009
|
*/
|
6001
6010
|
replace: function(newElm, oldElm, keepChildren) {
|
6002
6011
|
var self = this;
|
@@ -6090,9 +6099,9 @@ define("tinymce/dom/DOMUtils", [
|
|
6090
6099
|
* Executes the specified function on the element by id or dom element node or array of elements/id.
|
6091
6100
|
*
|
6092
6101
|
* @method run
|
6093
|
-
* @param {String/Element/Array}
|
6094
|
-
* @param {function}
|
6095
|
-
* @param {Object}
|
6102
|
+
* @param {String/Element/Array} elm ID or DOM element object or array with ids or elements.
|
6103
|
+
* @param {function} func Function to execute for each item.
|
6104
|
+
* @param {Object} scope Optional scope to execute the function in.
|
6096
6105
|
* @return {Object/Array} Single object, or an array of objects if multiple input elements were passed in.
|
6097
6106
|
*/
|
6098
6107
|
run: function(elm, func, scope) {
|
@@ -6632,7 +6641,6 @@ define("tinymce/dom/ScriptLoader", [
|
|
6632
6641
|
* @method load
|
6633
6642
|
* @param {String} url Absolute URL to script to add.
|
6634
6643
|
* @param {function} callback Optional callback function to execute ones this script gets loaded.
|
6635
|
-
* @param {Object} scope Optional scope to execute callback in.
|
6636
6644
|
*/
|
6637
6645
|
function loadScript(url, callback) {
|
6638
6646
|
var dom = DOM, elm, id;
|
@@ -6704,7 +6712,7 @@ define("tinymce/dom/ScriptLoader", [
|
|
6704
6712
|
* the script loader or to skip it from loading some script.
|
6705
6713
|
*
|
6706
6714
|
* @method markDone
|
6707
|
-
* @param {string}
|
6715
|
+
* @param {string} url Absolute URL to the script to mark as loaded.
|
6708
6716
|
*/
|
6709
6717
|
this.markDone = function(url) {
|
6710
6718
|
states[url] = LOADED;
|
@@ -7191,6 +7199,7 @@ define("tinymce/dom/RangeUtils", [
|
|
7191
7199
|
* @private
|
7192
7200
|
* @param {Node} node Node to collect siblings from.
|
7193
7201
|
* @param {String} name Name of the sibling to check for.
|
7202
|
+
* @param {Node} end_node
|
7194
7203
|
* @return {Array} Array of collected siblings.
|
7195
7204
|
*/
|
7196
7205
|
function collectSiblings(node, name, end_node) {
|
@@ -12994,6 +13003,7 @@ define("tinymce/dom/Selection", [
|
|
12994
13003
|
* @method Selection
|
12995
13004
|
* @param {tinymce.dom.DOMUtils} dom DOMUtils object reference.
|
12996
13005
|
* @param {Window} win Window to bind the selection object to.
|
13006
|
+
* @param {tinymce.Editor} editor
|
12997
13007
|
* @param {tinymce.dom.Serializer} serializer DOM serialization class to use for getContent.
|
12998
13008
|
*/
|
12999
13009
|
function Selection(dom, win, serializer, editor) {
|
@@ -13039,7 +13049,7 @@ define("tinymce/dom/Selection", [
|
|
13039
13049
|
* Returns the selected contents using the DOM serializer passed in to this class.
|
13040
13050
|
*
|
13041
13051
|
* @method getContent
|
13042
|
-
* @param {Object}
|
13052
|
+
* @param {Object} args Optional settings class with for example output format text or html.
|
13043
13053
|
* @return {String} Selected contents in for example HTML format.
|
13044
13054
|
* @example
|
13045
13055
|
* // Alerts the currently selected contents
|
@@ -13114,7 +13124,7 @@ define("tinymce/dom/Selection", [
|
|
13114
13124
|
args = args || {format: 'html'};
|
13115
13125
|
args.set = true;
|
13116
13126
|
args.selection = true;
|
13117
|
-
|
13127
|
+
args.content = content;
|
13118
13128
|
|
13119
13129
|
// Dispatch before set content event
|
13120
13130
|
if (!args.no_events) {
|
@@ -13335,7 +13345,7 @@ define("tinymce/dom/Selection", [
|
|
13335
13345
|
* Selects the specified element. This will place the start and end of the selection range around the element.
|
13336
13346
|
*
|
13337
13347
|
* @method select
|
13338
|
-
* @param {Element} node
|
13348
|
+
* @param {Element} node HTML DOM element to select.
|
13339
13349
|
* @param {Boolean} content Optional bool state if the contents should be selected or not on non IE browser.
|
13340
13350
|
* @return {Element} Selected element the same element as the one that got passed in.
|
13341
13351
|
* @example
|
@@ -13533,6 +13543,7 @@ define("tinymce/dom/Selection", [
|
|
13533
13543
|
*
|
13534
13544
|
* @method setRng
|
13535
13545
|
* @param {Range} rng Range to select.
|
13546
|
+
* @param {Boolean} forward
|
13536
13547
|
*/
|
13537
13548
|
setRng: function(rng, forward) {
|
13538
13549
|
var self = this, sel, node;
|
@@ -13591,7 +13602,6 @@ define("tinymce/dom/Selection", [
|
|
13591
13602
|
if (rng.cloneRange) {
|
13592
13603
|
try {
|
13593
13604
|
self.tridentSel.addRange(rng);
|
13594
|
-
return;
|
13595
13605
|
} catch (ex) {
|
13596
13606
|
//IE9 throws an error here if called before selection is placed in the editor
|
13597
13607
|
}
|
@@ -14446,8 +14456,8 @@ define("tinymce/Formatter", [
|
|
14446
14456
|
* Returns the format by name or all formats if no name is specified.
|
14447
14457
|
*
|
14448
14458
|
* @method get
|
14449
|
-
* @param {String} name Optional name to
|
14450
|
-
* @return {Array/Object} Array/Object with all
|
14459
|
+
* @param {String} name Optional name to retrieve by.
|
14460
|
+
* @return {Array/Object} Array/Object with all registered formats or a specific format.
|
14451
14461
|
*/
|
14452
14462
|
function get(name) {
|
14453
14463
|
return name ? formats[name] : formats;
|
@@ -14787,7 +14797,7 @@ define("tinymce/Formatter", [
|
|
14787
14797
|
|
14788
14798
|
// Remove empty nodes but only if there is multiple wrappers and they are not block
|
14789
14799
|
// elements so never remove single <h1></h1> since that would remove the
|
14790
|
-
//
|
14800
|
+
// current empty block element where the caret is at
|
14791
14801
|
if ((newWrappers.length > 1 || !isBlock(node)) && childCount === 0) {
|
14792
14802
|
dom.remove(node, 1);
|
14793
14803
|
return;
|
@@ -15486,8 +15496,8 @@ define("tinymce/Formatter", [
|
|
15486
15496
|
* Compares two string/nodes regardless of their case.
|
15487
15497
|
*
|
15488
15498
|
* @private
|
15489
|
-
* @param {String/Node} Node or string to compare.
|
15490
|
-
* @param {String/Node} Node or string to compare.
|
15499
|
+
* @param {String/Node} str1 Node or string to compare.
|
15500
|
+
* @param {String/Node} str2 Node or string to compare.
|
15491
15501
|
* @return {boolean} True/false if they match.
|
15492
15502
|
*/
|
15493
15503
|
function isEq(str1, str2) {
|
@@ -15518,7 +15528,7 @@ define("tinymce/Formatter", [
|
|
15518
15528
|
* to make it more easy to match. This will resolve a few browser issues.
|
15519
15529
|
*
|
15520
15530
|
* @private
|
15521
|
-
* @param {
|
15531
|
+
* @param {String} value Value to get style from.
|
15522
15532
|
* @param {String} name Style name to get.
|
15523
15533
|
* @return {String} Style item value.
|
15524
15534
|
*/
|
@@ -15582,7 +15592,8 @@ define("tinymce/Formatter", [
|
|
15582
15592
|
*
|
15583
15593
|
* @private
|
15584
15594
|
* @param {Object} rng Range like object.
|
15585
|
-
* @param {Array}
|
15595
|
+
* @param {Array} format Array with formats to expand by.
|
15596
|
+
* @param {Boolean} remove
|
15586
15597
|
* @return {Object} Expanded range like object.
|
15587
15598
|
*/
|
15588
15599
|
function expandRng(rng, format, remove) {
|
@@ -16609,7 +16620,7 @@ define("tinymce/UndoManager", [
|
|
16609
16620
|
|
16610
16621
|
trimContentRegExp = new RegExp([
|
16611
16622
|
'<span[^>]+data-mce-bogus[^>]+>[\u200B\uFEFF]+<\\/span>', // Trim bogus spans like caret containers
|
16612
|
-
'\\s?data-mce-selected="[^"]+"' // Trim
|
16623
|
+
'\\s?data-mce-selected="[^"]+"' // Trim temporary data-mce prefixed attributes like data-mce-selected
|
16613
16624
|
].join('|'), 'gi');
|
16614
16625
|
|
16615
16626
|
return function(editor) {
|
@@ -16735,7 +16746,7 @@ define("tinymce/UndoManager", [
|
|
16735
16746
|
return;
|
16736
16747
|
}
|
16737
16748
|
|
16738
|
-
// Is
|
16749
|
+
// Is character position keys left,right,up,down,home,end,pgdown,pgup,enter
|
16739
16750
|
if ((keyCode >= 33 && keyCode <= 36) || (keyCode >= 37 && keyCode <= 40) || keyCode == 45) {
|
16740
16751
|
if (self.typing) {
|
16741
16752
|
addNonTypingUndoLevel(e);
|
@@ -16772,7 +16783,7 @@ define("tinymce/UndoManager", [
|
|
16772
16783
|
|
16773
16784
|
/*eslint consistent-this:0 */
|
16774
16785
|
self = {
|
16775
|
-
//
|
16786
|
+
// Explode for debugging reasons
|
16776
16787
|
data: data,
|
16777
16788
|
|
16778
16789
|
/**
|
@@ -16800,7 +16811,7 @@ define("tinymce/UndoManager", [
|
|
16800
16811
|
*
|
16801
16812
|
* @method add
|
16802
16813
|
* @param {Object} level Optional undo level object to add.
|
16803
|
-
* @param {DOMEvent}
|
16814
|
+
* @param {DOMEvent} event Optional event responsible for the creation of the undo level.
|
16804
16815
|
* @return {Object} Undo level that got added or null it a level wasn't needed.
|
16805
16816
|
*/
|
16806
16817
|
add: function(level, event) {
|
@@ -16950,10 +16961,10 @@ define("tinymce/UndoManager", [
|
|
16950
16961
|
},
|
16951
16962
|
|
16952
16963
|
/**
|
16953
|
-
* Executes the specified function in an undo
|
16964
|
+
* Executes the specified function in an undo translation. The selection
|
16954
16965
|
* before the modification will be stored to the undo stack and if the DOM changes
|
16955
|
-
* it will add a new undo level. Any methods within the
|
16956
|
-
* be ignored. So a
|
16966
|
+
* it will add a new undo level. Any methods within the translation that adds undo levels will
|
16967
|
+
* be ignored. So a translation can include calls to execCommand or editor.insertContent.
|
16957
16968
|
*
|
16958
16969
|
* @method transact
|
16959
16970
|
* @param {function} callback Function to execute dom manipulation logic in.
|
@@ -17527,7 +17538,7 @@ define("tinymce/EnterKey", [
|
|
17527
17538
|
}
|
17528
17539
|
}
|
17529
17540
|
|
17530
|
-
// Get editable root node
|
17541
|
+
// Get editable root node, normally the body element but sometimes a div or span
|
17531
17542
|
editableRoot = getEditableRoot(container);
|
17532
17543
|
|
17533
17544
|
// If there is no editable root then enter is done inside a contentEditable false element
|
@@ -17846,6 +17857,7 @@ define("tinymce/EditorCommands", [
|
|
17846
17857
|
* @param {String} command Command to execute.
|
17847
17858
|
* @param {Boolean} ui Optional user interface state.
|
17848
17859
|
* @param {Object} value Optional value for command.
|
17860
|
+
* @param {Object} args
|
17849
17861
|
* @return {Boolean} true/false if the command was found or not.
|
17850
17862
|
*/
|
17851
17863
|
function execCommand(command, ui, value, args) {
|
@@ -17855,7 +17867,6 @@ define("tinymce/EditorCommands", [
|
|
17855
17867
|
editor.focus();
|
17856
17868
|
}
|
17857
17869
|
|
17858
|
-
args = extend({}, args);
|
17859
17870
|
args = editor.fire('BeforeExecCommand', {command: command, ui: ui, value: value});
|
17860
17871
|
if (args.isDefaultPrevented()) {
|
17861
17872
|
return false;
|
@@ -17988,7 +17999,7 @@ define("tinymce/EditorCommands", [
|
|
17988
17999
|
* Returns true/false if the command is supported or not.
|
17989
18000
|
*
|
17990
18001
|
* @method queryCommandSupported
|
17991
|
-
* @param {String}
|
18002
|
+
* @param {String} command Command that we check support for.
|
17992
18003
|
* @return {Boolean} true/false if the command is supported or not.
|
17993
18004
|
*/
|
17994
18005
|
function queryCommandSupported(command) {
|
@@ -20288,8 +20299,8 @@ define("tinymce/ui/Selector", [
|
|
20288
20299
|
add(compileAttrFilter(parts[4], parts[5], parts[6]));
|
20289
20300
|
add(compilePsuedoFilter(parts[7]));
|
20290
20301
|
|
20291
|
-
// Mark the filter with
|
20292
|
-
filters.
|
20302
|
+
// Mark the filter with pseudo for performance
|
20303
|
+
filters.pseudo = !!parts[7];
|
20293
20304
|
filters.direct = direct;
|
20294
20305
|
|
20295
20306
|
return filters;
|
@@ -20337,7 +20348,7 @@ define("tinymce/ui/Selector", [
|
|
20337
20348
|
* Returns true/false if the selector matches the specified control.
|
20338
20349
|
*
|
20339
20350
|
* @method match
|
20340
|
-
* @param {tinymce.ui.Control} control Control to match
|
20351
|
+
* @param {tinymce.ui.Control} control Control to match against the selector.
|
20341
20352
|
* @param {Array} selectors Optional array of selectors, mostly used internally.
|
20342
20353
|
* @return {Boolean} true/false state if the control matches or not.
|
20343
20354
|
*/
|
@@ -20355,8 +20366,8 @@ define("tinymce/ui/Selector", [
|
|
20355
20366
|
filters = selector[si];
|
20356
20367
|
|
20357
20368
|
while (item) {
|
20358
|
-
// Find the index and length since a
|
20359
|
-
if (filters.
|
20369
|
+
// Find the index and length since a pseudo filter like :first needs it
|
20370
|
+
if (filters.pseudo) {
|
20360
20371
|
siblings = item.parent().items();
|
20361
20372
|
index = length = siblings.length;
|
20362
20373
|
while (index--) {
|
@@ -20413,7 +20424,7 @@ define("tinymce/ui/Selector", [
|
|
20413
20424
|
for (i = 0, l = items.length; i < l; i++) {
|
20414
20425
|
item = items[i];
|
20415
20426
|
|
20416
|
-
// Run each filter
|
20427
|
+
// Run each filter against the item
|
20417
20428
|
for (fi = 0, fl = filters.length; fi < fl; fi++) {
|
20418
20429
|
if (!filters[fi](item, i, l)) {
|
20419
20430
|
fi = fl + 1;
|
@@ -21031,7 +21042,7 @@ define("tinymce/ui/DomUtils", [
|
|
21031
21042
|
*/
|
21032
21043
|
|
21033
21044
|
/**
|
21034
|
-
* Utility class for box parsing and
|
21045
|
+
* Utility class for box parsing and measuring.
|
21035
21046
|
*
|
21036
21047
|
* @private
|
21037
21048
|
* @class tinymce.ui.BoxUtils
|
@@ -21740,7 +21751,7 @@ define("tinymce/ui/Control", [
|
|
21740
21751
|
*/
|
21741
21752
|
repaint: function() {
|
21742
21753
|
var self = this, style, bodyStyle, bodyElm, rect, borderBox;
|
21743
|
-
var borderW
|
21754
|
+
var borderW, borderH, lastRepaintRect, round, value;
|
21744
21755
|
|
21745
21756
|
// Use Math.round on all values on IE < 9
|
21746
21757
|
round = !document.createRange ? Math.round : function(value) {
|
@@ -21862,7 +21873,7 @@ define("tinymce/ui/Control", [
|
|
21862
21873
|
* @method off
|
21863
21874
|
* @param {String} [name] Name for the event to unbind.
|
21864
21875
|
* @param {function} [callback] Callback function to unbind.
|
21865
|
-
* @return {
|
21876
|
+
* @return {tinymce.ui.Control} Current control object.
|
21866
21877
|
*/
|
21867
21878
|
off: function(name, callback) {
|
21868
21879
|
getEventDispatcher(this).off(name, callback);
|
@@ -21876,7 +21887,7 @@ define("tinymce/ui/Control", [
|
|
21876
21887
|
* @method fire
|
21877
21888
|
* @param {String} name Name of the event to fire.
|
21878
21889
|
* @param {Object} [args] Arguments to pass to the event.
|
21879
|
-
* @param {Boolean} [bubble] Value to control
|
21890
|
+
* @param {Boolean} [bubble] Value to control bubbling. Defaults to true.
|
21880
21891
|
* @return {Object} Current arguments object.
|
21881
21892
|
*/
|
21882
21893
|
fire: function(name, args, bubble) {
|
@@ -25475,6 +25486,7 @@ define("tinymce/WindowManager", [
|
|
25475
25486
|
*
|
25476
25487
|
* @method open
|
25477
25488
|
* @param {Object} args Optional name/value settings collection contains things like width/height/url etc.
|
25489
|
+
* @param {Object} params
|
25478
25490
|
* @option {String} title Window title.
|
25479
25491
|
* @option {String} file URL of the file to open in the window.
|
25480
25492
|
* @option {Number} width Width in pixels.
|
@@ -25586,7 +25598,7 @@ define("tinymce/WindowManager", [
|
|
25586
25598
|
* native version use the callback method instead then it can be extended.
|
25587
25599
|
*
|
25588
25600
|
* @method confirm
|
25589
|
-
* @param {String}
|
25601
|
+
* @param {String} message Text to display in the new confirm dialog.
|
25590
25602
|
* @param {function} callback Callback function to be executed after the user has selected ok or cancel.
|
25591
25603
|
* @param {Object} scope Optional scope to execute the callback in.
|
25592
25604
|
* @example
|
@@ -25655,55 +25667,55 @@ define("tinymce/WindowManager", [
|
|
25655
25667
|
|
25656
25668
|
// Included from: js/tinymce/classes/dom/NodePath.js
|
25657
25669
|
|
25658
|
-
/**
|
25659
|
-
* NodePath.js
|
25660
|
-
*
|
25661
|
-
* Released under LGPL License.
|
25662
|
-
* Copyright (c) 1999-2015 Ephox Corp. All rights reserved
|
25663
|
-
*
|
25664
|
-
* License: http://www.tinymce.com/license
|
25665
|
-
* Contributing: http://www.tinymce.com/contributing
|
25666
|
-
*/
|
25667
|
-
|
25668
|
-
/**
|
25669
|
-
* Handles paths of nodes within an element.
|
25670
|
-
*
|
25671
|
-
* @private
|
25672
|
-
* @class tinymce.dom.NodePath
|
25673
|
-
*/
|
25674
|
-
define("tinymce/dom/NodePath", [
|
25675
|
-
"tinymce/dom/DOMUtils"
|
25676
|
-
], function(DOMUtils) {
|
25677
|
-
function create(rootNode, targetNode, normalized) {
|
25678
|
-
var path = [];
|
25679
|
-
|
25680
|
-
for (; targetNode && targetNode != rootNode; targetNode = targetNode.parentNode) {
|
25681
|
-
path.push(DOMUtils.nodeIndex(targetNode, normalized));
|
25682
|
-
}
|
25683
|
-
|
25684
|
-
return path;
|
25685
|
-
}
|
25686
|
-
|
25687
|
-
function resolve(rootNode, path) {
|
25688
|
-
var i, node, children;
|
25689
|
-
|
25690
|
-
for (node = rootNode, i = path.length - 1; i >= 0; i--) {
|
25691
|
-
children = node.childNodes;
|
25692
|
-
|
25693
|
-
if (path[i] > children.length - 1) {
|
25694
|
-
return null;
|
25695
|
-
}
|
25696
|
-
|
25697
|
-
node = children[path[i]];
|
25698
|
-
}
|
25699
|
-
|
25700
|
-
return node;
|
25701
|
-
}
|
25702
|
-
|
25703
|
-
return {
|
25704
|
-
create: create,
|
25705
|
-
resolve: resolve
|
25706
|
-
};
|
25670
|
+
/**
|
25671
|
+
* NodePath.js
|
25672
|
+
*
|
25673
|
+
* Released under LGPL License.
|
25674
|
+
* Copyright (c) 1999-2015 Ephox Corp. All rights reserved
|
25675
|
+
*
|
25676
|
+
* License: http://www.tinymce.com/license
|
25677
|
+
* Contributing: http://www.tinymce.com/contributing
|
25678
|
+
*/
|
25679
|
+
|
25680
|
+
/**
|
25681
|
+
* Handles paths of nodes within an element.
|
25682
|
+
*
|
25683
|
+
* @private
|
25684
|
+
* @class tinymce.dom.NodePath
|
25685
|
+
*/
|
25686
|
+
define("tinymce/dom/NodePath", [
|
25687
|
+
"tinymce/dom/DOMUtils"
|
25688
|
+
], function(DOMUtils) {
|
25689
|
+
function create(rootNode, targetNode, normalized) {
|
25690
|
+
var path = [];
|
25691
|
+
|
25692
|
+
for (; targetNode && targetNode != rootNode; targetNode = targetNode.parentNode) {
|
25693
|
+
path.push(DOMUtils.nodeIndex(targetNode, normalized));
|
25694
|
+
}
|
25695
|
+
|
25696
|
+
return path;
|
25697
|
+
}
|
25698
|
+
|
25699
|
+
function resolve(rootNode, path) {
|
25700
|
+
var i, node, children;
|
25701
|
+
|
25702
|
+
for (node = rootNode, i = path.length - 1; i >= 0; i--) {
|
25703
|
+
children = node.childNodes;
|
25704
|
+
|
25705
|
+
if (path[i] > children.length - 1) {
|
25706
|
+
return null;
|
25707
|
+
}
|
25708
|
+
|
25709
|
+
node = children[path[i]];
|
25710
|
+
}
|
25711
|
+
|
25712
|
+
return node;
|
25713
|
+
}
|
25714
|
+
|
25715
|
+
return {
|
25716
|
+
create: create,
|
25717
|
+
resolve: resolve
|
25718
|
+
};
|
25707
25719
|
});
|
25708
25720
|
|
25709
25721
|
// Included from: js/tinymce/classes/util/Quirks.js
|
@@ -27742,7 +27754,7 @@ define("tinymce/Shortcuts", [
|
|
27742
27754
|
* @param {String} pattern Shortcut pattern. Like for example: ctrl+alt+o.
|
27743
27755
|
* @param {String} desc Text description for the command.
|
27744
27756
|
* @param {String/Function} cmdFunc Command name string or function to execute when the key is pressed.
|
27745
|
-
* @param {Object}
|
27757
|
+
* @param {Object} scope Optional scope to execute the function in.
|
27746
27758
|
* @return {Boolean} true/false state if the shortcut was added or not.
|
27747
27759
|
*/
|
27748
27760
|
self.add = function(pattern, desc, cmdFunc, scope) {
|
@@ -28874,7 +28886,7 @@ define("tinymce/Editor", [
|
|
28874
28886
|
self.isNotDirty = true;
|
28875
28887
|
|
28876
28888
|
/**
|
28877
|
-
* Name/Value object
|
28889
|
+
* Name/Value object containing plugin instances.
|
28878
28890
|
*
|
28879
28891
|
* @property plugins
|
28880
28892
|
* @type Object
|
@@ -28974,7 +28986,7 @@ define("tinymce/Editor", [
|
|
28974
28986
|
|
28975
28987
|
Editor.prototype = {
|
28976
28988
|
/**
|
28977
|
-
*
|
28989
|
+
* Renders the editor/adds it to the page.
|
28978
28990
|
*
|
28979
28991
|
* @method render
|
28980
28992
|
*/
|
@@ -31341,7 +31353,7 @@ define("tinymce/EditorManager", [
|
|
31341
31353
|
* @property minorVersion
|
31342
31354
|
* @type String
|
31343
31355
|
*/
|
31344
|
-
minorVersion: '2.
|
31356
|
+
minorVersion: '2.8',
|
31345
31357
|
|
31346
31358
|
/**
|
31347
31359
|
* Release date of TinyMCE build.
|
@@ -31349,7 +31361,7 @@ define("tinymce/EditorManager", [
|
|
31349
31361
|
* @property releaseDate
|
31350
31362
|
* @type String
|
31351
31363
|
*/
|
31352
|
-
releaseDate: '2015-
|
31364
|
+
releaseDate: '2015-11-13',
|
31353
31365
|
|
31354
31366
|
/**
|
31355
31367
|
* Collection of editor instances.
|
@@ -31791,9 +31803,9 @@ define("tinymce/EditorManager", [
|
|
31791
31803
|
* Executes a specific command on the currently active editor.
|
31792
31804
|
*
|
31793
31805
|
* @method execCommand
|
31794
|
-
* @param {String}
|
31795
|
-
* @param {Boolean}
|
31796
|
-
* @param {String}
|
31806
|
+
* @param {String} cmd Command to perform for example Bold.
|
31807
|
+
* @param {Boolean} ui Optional boolean state if a UI should be presented for the command or not.
|
31808
|
+
* @param {String} value Optional value parameter like for example an URL to a link.
|
31797
31809
|
* @return {Boolean} true/false if the command was executed or not.
|
31798
31810
|
*/
|
31799
31811
|
execCommand: function(cmd, ui, value) {
|
@@ -32641,7 +32653,7 @@ define("tinymce/Compat", [
|
|
32641
32653
|
// Describe the different namespaces
|
32642
32654
|
|
32643
32655
|
/**
|
32644
|
-
* Root level namespace this contains classes directly
|
32656
|
+
* Root level namespace this contains classes directly related to the TinyMCE editor.
|
32645
32657
|
*
|
32646
32658
|
* @namespace tinymce
|
32647
32659
|
*/
|
@@ -35753,21 +35765,23 @@ define("tinymce/ui/FormatControls", [
|
|
35753
35765
|
|
35754
35766
|
formatMenu = createFormatMenu();
|
35755
35767
|
|
35756
|
-
function initOnPostRender() {
|
35757
|
-
|
35768
|
+
function initOnPostRender(name) {
|
35769
|
+
return function() {
|
35770
|
+
var self = this;
|
35758
35771
|
|
35759
|
-
|
35760
|
-
|
35761
|
-
editor.formatter.formatChanged(name, function(state) {
|
35762
|
-
self.active(state);
|
35763
|
-
});
|
35764
|
-
} else {
|
35765
|
-
editor.on('init', function() {
|
35772
|
+
// TODO: Fix this
|
35773
|
+
if (editor.formatter) {
|
35766
35774
|
editor.formatter.formatChanged(name, function(state) {
|
35767
35775
|
self.active(state);
|
35768
35776
|
});
|
35769
|
-
}
|
35770
|
-
|
35777
|
+
} else {
|
35778
|
+
editor.on('init', function() {
|
35779
|
+
editor.formatter.formatChanged(name, function(state) {
|
35780
|
+
self.active(state);
|
35781
|
+
});
|
35782
|
+
});
|
35783
|
+
}
|
35784
|
+
};
|
35771
35785
|
}
|
35772
35786
|
|
35773
35787
|
// Simple format controls <control/format>:<UI text>
|
@@ -35781,9 +35795,7 @@ define("tinymce/ui/FormatControls", [
|
|
35781
35795
|
}, function(text, name) {
|
35782
35796
|
editor.addButton(name, {
|
35783
35797
|
tooltip: text,
|
35784
|
-
onPostRender:
|
35785
|
-
initOnPostRender();
|
35786
|
-
},
|
35798
|
+
onPostRender: initOnPostRender(name),
|
35787
35799
|
onclick: function() {
|
35788
35800
|
toggleFormat(name);
|
35789
35801
|
}
|
@@ -35825,9 +35837,7 @@ define("tinymce/ui/FormatControls", [
|
|
35825
35837
|
editor.addButton(name, {
|
35826
35838
|
tooltip: item[0],
|
35827
35839
|
cmd: item[1],
|
35828
|
-
onPostRender:
|
35829
|
-
initOnPostRender();
|
35830
|
-
}
|
35840
|
+
onPostRender: initOnPostRender(name)
|
35831
35841
|
});
|
35832
35842
|
});
|
35833
35843
|
|
@@ -36099,7 +36109,7 @@ define("tinymce/ui/GridLayout", [
|
|
36099
36109
|
* @param {tinymce.ui.Container} container Container instance to recalc.
|
36100
36110
|
*/
|
36101
36111
|
recalc: function(container) {
|
36102
|
-
var settings
|
36112
|
+
var settings, rows, cols, items, contLayoutRect, width, height, rect,
|
36103
36113
|
ctrlLayoutRect, ctrl, x, y, posX, posY, ctrlSettings, contPaddingBox, align, spacingH, spacingV, alignH, alignV, maxX, maxY,
|
36104
36114
|
colWidths = [], rowHeights = [], ctrlMinWidth, ctrlMinHeight, availableWidth, availableHeight, reverseRows, idx;
|
36105
36115
|
|
@@ -36340,7 +36350,7 @@ define("tinymce/ui/Iframe", [
|
|
36340
36350
|
/*eslint no-script-url:0 */
|
36341
36351
|
return (
|
36342
36352
|
'<iframe id="' + self._id + '" class="' + self.classes + '" tabindex="-1" src="' +
|
36343
|
-
(self.settings.url || "javascript
|
36353
|
+
(self.settings.url || "javascript:''") + '" frameborder="0"></iframe>'
|
36344
36354
|
);
|
36345
36355
|
},
|
36346
36356
|
|
@@ -36415,7 +36425,7 @@ define("tinymce/ui/Label", [
|
|
36415
36425
|
*
|
36416
36426
|
* @constructor
|
36417
36427
|
* @param {Object} settings Name/value object with settings.
|
36418
|
-
* @
|
36428
|
+
* @setting {Boolean} multiline Multiline label.
|
36419
36429
|
*/
|
36420
36430
|
init: function(settings) {
|
36421
36431
|
var self = this;
|
@@ -37103,7 +37113,6 @@ define("tinymce/ui/MenuItem", [
|
|
37103
37113
|
}
|
37104
37114
|
|
37105
37115
|
if (settings.image) {
|
37106
|
-
icon = 'none';
|
37107
37116
|
image = ' style="background-image: url(\'' + settings.image + '\')"';
|
37108
37117
|
}
|
37109
37118
|
|
@@ -37212,7 +37221,7 @@ define("tinymce/ui/Menu", [
|
|
37212
37221
|
], function(FloatPanel, MenuItem, Tools) {
|
37213
37222
|
"use strict";
|
37214
37223
|
|
37215
|
-
|
37224
|
+
return FloatPanel.extend({
|
37216
37225
|
Defaults: {
|
37217
37226
|
defaultType: 'menuitem',
|
37218
37227
|
border: 1,
|
@@ -37307,8 +37316,6 @@ define("tinymce/ui/Menu", [
|
|
37307
37316
|
return self._super();
|
37308
37317
|
}
|
37309
37318
|
});
|
37310
|
-
|
37311
|
-
return Menu;
|
37312
37319
|
});
|
37313
37320
|
|
37314
37321
|
// Included from: js/tinymce/classes/ui/ListBox.js
|
@@ -37581,10 +37588,10 @@ define("tinymce/ui/Rect", [
|
|
37581
37588
|
* Tests various positions to get the most suitable one.
|
37582
37589
|
*
|
37583
37590
|
* @method findBestRelativePosition
|
37584
|
-
* @param {Rect}
|
37591
|
+
* @param {Rect} rect Rect to use as source.
|
37585
37592
|
* @param {Rect} targetRect Rect to move relative to.
|
37586
37593
|
* @param {Rect} constrainRect Rect to constrain within.
|
37587
|
-
* @param {Array} Array of relative positions to test against.
|
37594
|
+
* @param {Array} rels Array of relative positions to test against.
|
37588
37595
|
*/
|
37589
37596
|
function findBestRelativePosition(rect, targetRect, constrainRect, rels) {
|
37590
37597
|
var pos, i;
|
@@ -37625,13 +37632,13 @@ define("tinymce/ui/Rect", [
|
|
37625
37632
|
* @param {Rect} cropRect The second rectangle to compare.
|
37626
37633
|
* @return {Rect} The intersection of the two rectangles or null if they don't intersect.
|
37627
37634
|
*/
|
37628
|
-
function intersect(
|
37635
|
+
function intersect(rect, cropRect) {
|
37629
37636
|
var x1, y1, x2, y2;
|
37630
37637
|
|
37631
|
-
x1 = max(
|
37632
|
-
y1 = max(
|
37633
|
-
x2 = min(
|
37634
|
-
y2 = min(
|
37638
|
+
x1 = max(rect.x, cropRect.x);
|
37639
|
+
y1 = max(rect.y, cropRect.y);
|
37640
|
+
x2 = min(rect.x + rect.w, cropRect.x + cropRect.w);
|
37641
|
+
y2 = min(rect.y + rect.h, cropRect.y + cropRect.h);
|
37635
37642
|
|
37636
37643
|
if (x2 - x1 < 0 || y2 - y1 < 0) {
|
37637
37644
|
return null;
|
@@ -38422,7 +38429,7 @@ define("tinymce/ui/TextBox", [
|
|
38422
38429
|
* @method repaint
|
38423
38430
|
*/
|
38424
38431
|
repaint: function() {
|
38425
|
-
var self = this, style, rect, borderBox, borderW
|
38432
|
+
var self = this, style, rect, borderBox, borderW, borderH = 0, lastRepaintRect;
|
38426
38433
|
|
38427
38434
|
style = self.getEl().style;
|
38428
38435
|
rect = self._layoutRect;
|