RubyGems - tinymce-rails - Versions diffs - 4.4.0 → 4.4.1 - Mend

tinymce-rails 4.4.0 → 4.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (26) hide show

data/vendor/assets/javascripts/tinymce/themes/inlite/src/demo/html/demo.html CHANGED

@@ -13,30 +13,57 @@ ephox.bolt.module.api.main('tinymce/inlite/Demo');
 <body>
 <h2>inlite-theme Demo Page</h2>
 <div id="ephox-ui">
-<div class="tinymce" style="width: 900px; min-height: 100px">
-		<p>
-			<img src="https://www.tinymce.com/images/glyph-tinymce@2x.png" style="width: 100px; float: right">
-			Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ultricies posuere felis sed interdum. Quisque nec diam
-			nec purus gravida dapibus
-		</p>
-		<p>
-			eget non <a href="http://www.tinymce.com">nulla</a>. Ut eu vestibulum libero. Vestibulum pretium est vitae metus auctor, quis fermentum mi
-			luctus. Fusce aliquet tincidunt massa vitae scelerisque. Vivamus in tellus risus. Mauris auctor metus ut gravida feugiat.
-			Nunc consequat urna eu augue commodo, eget malesuada odio fringilla. Morbi vitae turpis in elit laoreet malesuada a nec massa.
-		</p>
-	<table>
-		<tbody>
-			<tr>
-				<td>Lorem ipsum dolor sit amet</td>
-				<td>Lorem ipsum dolor sit amet</td>
-			</tr>
-			<tr>
-				<td>Vivamus in tellus risus</td>
-				<td>Vivamus in tellus risus</td>
-			</tr>
-		</tbody>
-	</table>
-</div>
+	<div class="tinymce" style="width: 900px; min-height: 100px">
+			<p>
+				<img src="https://www.tinymce.com/images/glyph-tinymce@2x.png" style="width: 100px; float: right">
+				Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ultricies posuere felis sed interdum. Quisque nec diam
+				nec purus gravida dapibus
+			</p>
+			<p>
+				eget non <a href="http://www.tinymce.com">nulla</a>. Ut eu vestibulum libero. Vestibulum pretium est vitae metus auctor, quis fermentum mi
+				luctus. Fusce aliquet tincidunt massa vitae scelerisque. Vivamus in tellus risus. Mauris auctor metus ut gravida feugiat.
+				Nunc consequat urna eu augue commodo, eget malesuada odio fringilla. Morbi vitae turpis in elit laoreet malesuada a nec massa.
+			</p>
+		<table>
+			<tbody>
+				<tr>
+					<td>Lorem ipsum dolor sit amet</td>
+					<td>Lorem ipsum dolor sit amet</td>
+				</tr>
+				<tr>
+					<td>Vivamus in tellus risus</td>
+					<td>Vivamus in tellus risus</td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+	<div style="height: 3000px"></div>
+	<div class="tinymce" style="width: 900px; min-height: 100px; margin: 20px; border: 20px solid black; padding: 20px">
+			<p>
+				<img src="https://www.tinymce.com/images/glyph-tinymce@2x.png" style="width: 100px; float: right">
+				Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ultricies posuere felis sed interdum. Quisque nec diam
+				nec purus gravida dapibus
+			</p>
+			<p>
+				eget non <a href="http://www.tinymce.com">nulla</a>. Ut eu vestibulum libero. Vestibulum pretium est vitae metus auctor, quis fermentum mi
+				luctus. Fusce aliquet tincidunt massa vitae scelerisque. Vivamus in tellus risus. Mauris auctor metus ut gravida feugiat.
+				Nunc consequat urna eu augue commodo, eget malesuada odio fringilla. Morbi vitae turpis in elit laoreet malesuada a nec massa.
+			</p>
+		<table>
+			<tbody>
+				<tr>
+					<td>Lorem ipsum dolor sit amet</td>
+					<td>Lorem ipsum dolor sit amet</td>
+				</tr>
+				<tr>
+					<td>Vivamus in tellus risus</td>
+					<td>Vivamus in tellus risus</td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
 </div>
 </body>
 </html>

data/vendor/assets/javascripts/tinymce/themes/inlite/src/main/js/tinymce/inlite/Theme.js CHANGED

@@ -63,11 +63,16 @@ define('tinymce/inlite/Theme', [
 		return result && result.rect ? result : null;
 	};
-	var togglePanel = function (editor) {
+	var togglePanel = function (editor, panel) {
 		var toggle = function () {
 			var toolbars = getToolbars(editor);
 			var result = findMatchResult(editor, toolbars);
-			result ? Panel.show(editor, result.id, result.rect, toolbars) : Panel.hide();
+			if (result) {
+				panel.show(editor, result.id, result.rect, toolbars);
+			} else {
+				panel.hide();
+			}
 		};
 		return function () {
@@ -77,28 +82,28 @@ define('tinymce/inlite/Theme', [
 		};
 	};
-	var ignoreWhenFormIsVisible = function (f) {
+	var ignoreWhenFormIsVisible = function (panel, f) {
 		return function () {
-			if (!Panel.inForm()) {
+			if (!panel.inForm()) {
 				f();
 			}
 		};
 	};
-	var bindContextualToolbarsEvents = function (editor) {
-		var throttledTogglePanel = Delay.throttle(togglePanel(editor), 0);
-		var throttledTogglePanelWhenNotInForm = Delay.throttle(ignoreWhenFormIsVisible(togglePanel(editor)), 0);
+	var bindContextualToolbarsEvents = function (editor, panel) {
+		var throttledTogglePanel = Delay.throttle(togglePanel(editor, panel), 0);
+		var throttledTogglePanelWhenNotInForm = Delay.throttle(ignoreWhenFormIsVisible(panel, togglePanel(editor, panel)), 0);
-		editor.on('blur hide ObjectResizeStart', Panel.hide);
+		editor.on('blur hide ObjectResizeStart', panel.hide);
 		editor.on('click', throttledTogglePanel);
 		editor.on('nodeChange mouseup', throttledTogglePanelWhenNotInForm);
 		editor.on('ResizeEditor ResizeWindow keyup', throttledTogglePanel);
-		editor.on('remove', Panel.remove);
+		editor.on('remove', panel.remove);
-		editor.shortcuts.add('Alt+F10', '', Panel.focus);
+		editor.shortcuts.add('Alt+F10', '', panel.focus);
 	};
-	var overrideLinkShortcut = function (editor) {
+	var overrideLinkShortcut = function (editor, panel) {
 		editor.shortcuts.remove('meta+k');
 		editor.shortcuts.add('meta+k', '', function () {
 			var toolbars = getToolbars(editor);
@@ -107,17 +112,17 @@ define('tinymce/inlite/Theme', [
 			]);
 			if (result) {
-				Panel.show(editor, result.id, result.rect, toolbars);
+				panel.show(editor, result.id, result.rect, toolbars);
 			}
 		});
 	};
-	var renderInlineUI = function (editor) {
+	var renderInlineUI = function (editor, panel) {
 		var skinName = editor.settings.skin || 'lightgray';
 		SkinLoader.load(editor, skinName, function () {
-			bindContextualToolbarsEvents(editor);
-			overrideLinkShortcut(editor);
+			bindContextualToolbarsEvents(editor, panel);
+			overrideLinkShortcut(editor, panel);
 		});
 		return {};
@@ -128,10 +133,12 @@ define('tinymce/inlite/Theme', [
 	};
 	ThemeManager.add('inlite', function (editor) {
-		Buttons.addToEditor(editor);
+		var panel = new Panel();
+		Buttons.addToEditor(editor, panel);
 		var renderUI = function () {
-			return editor.inline ? renderInlineUI(editor) : fail('inlite theme only supports inline mode.');
+			return editor.inline ? renderInlineUI(editor, panel) : fail('inlite theme only supports inline mode.');
 		};
 		return {

data/vendor/assets/javascripts/tinymce/themes/inlite/src/main/js/tinymce/inlite/core/Measure.js CHANGED

@@ -24,36 +24,27 @@ define('tinymce/inlite/core/Measure', [
 		};
 	};
-	var getElementRect = function (editor, elm) {
-		var pos, targetRect, root;
-		pos = DOM.getPos(editor.getContentAreaContainer());
-		targetRect = editor.dom.getRect(elm);
-		root = editor.dom.getRoot();
-		// Adjust targetPos for scrolling in the editor
-		if (root.nodeName == 'BODY') {
-			targetRect.x -= root.ownerDocument.documentElement.scrollLeft || root.scrollLeft;
-			targetRect.y -= root.ownerDocument.documentElement.scrollTop || root.scrollTop;
-		}
-		targetRect.x += pos.x;
-		targetRect.y += pos.y;
-		// We need to use these instead of the rect values since the style
-		// size properites might not be the same as the real size for a table
-		targetRect.w = elm.clientWidth > 0 ? elm.clientWidth : elm.offsetWidth;
-		targetRect.h = elm.clientHeight > 0 ? elm.clientHeight : elm.offsetHeight;
+	var measureElement = function (elm) {
+		var clientRect = elm.getBoundingClientRect();
+		return toAbsolute({
+			x: clientRect.left,
+			y: clientRect.top,
+			w: Math.max(elm.clientWidth, elm.offsetWidth),
+			h: Math.max(elm.clientHeight, elm.offsetHeight)
+		});
+	};
-		return targetRect;
+	var getElementRect = function (editor, elm) {
+		return measureElement(elm);
 	};
 	var getPageAreaRect = function (editor) {
-		return DOM.getRect(editor.getElement().ownerDocument.body);
+		return measureElement(editor.getElement().ownerDocument.body);
 	};
 	var getContentAreaRect = function (editor) {
-		return toAbsolute(DOM.getRect(editor.getContentAreaContainer() || editor.getBody()));
+		return measureElement(editor.getContentAreaContainer() || editor.getBody());
 	};
 	var getSelectionRect = function (editor) {

data/vendor/assets/javascripts/tinymce/themes/inlite/src/main/js/tinymce/inlite/core/UrlType.js CHANGED

@@ -14,8 +14,13 @@ define('tinymce/inlite/core/UrlType', [
 		return /^www\.|\.(com|org|edu|gov|uk|net|ca|de|jp|fr|au|us|ru|ch|it|nl|se|no|es|mil)$/i.test(href.trim());
 	};
+	var isAbsolute = function (href) {
+		return /^https?:\/\//.test(href.trim());
+	};
 	return {
-		isDomainLike: isDomainLike
+		isDomainLike: isDomainLike,
+		isAbsolute: isAbsolute
 	};
 });

data/vendor/assets/javascripts/tinymce/themes/inlite/src/main/js/tinymce/inlite/ui/Buttons.js CHANGED

@@ -38,13 +38,13 @@ define('tinymce/inlite/ui/Buttons', [
 		}
 	};
-	var addToEditor = function (editor) {
+	var addToEditor = function (editor, panel) {
 		editor.addButton('quicklink', {
 			icon: 'link',
 			tooltip: 'Insert/Edit link',
 			stateSelector: 'a[href]',
 			onclick: function () {
-				Panel.showForm(editor, 'quicklink');
+				panel.showForm(editor, 'quicklink');
 			}
 		});
@@ -66,7 +66,7 @@ define('tinymce/inlite/ui/Buttons', [
 			icon: 'table',
 			tooltip: 'Insert table',
 			onclick: function () {
-				Panel.hide();
+				panel.hide();
 				Actions.insertTable(editor, 2, 2);
 			}
 		});

data/vendor/assets/javascripts/tinymce/themes/inlite/src/main/js/tinymce/inlite/ui/Forms.js CHANGED

@@ -57,7 +57,7 @@ define('tinymce/inlite/ui/Forms', [
 	};
 	var convertLinkToAbsolute = function (editor, href) {
-		return UrlType.isDomainLike(href) ? askAboutPrefix(editor, href) : Promise.resolve(href);
+		return !UrlType.isAbsolute(href) && UrlType.isDomainLike(href) ? askAboutPrefix(editor, href) : Promise.resolve(href);
 	};
 	var createQuickLinkForm = function (editor, hide) {

data/vendor/assets/javascripts/tinymce/themes/inlite/src/main/js/tinymce/inlite/ui/Panel.js CHANGED

@@ -17,138 +17,103 @@ define('tinymce/inlite/ui/Panel', [
 	'tinymce/inlite/core/Measure',
 	'tinymce/inlite/core/Layout'
 ], function (Tools, Factory, DOM, Toolbar, Forms, Measure, Layout) {
-	var DEFAULT_TEXT_SELECTION_ITEMS = 'bold italic | quicklink h2 h3 blockquote';
-	var DEFAULT_INSERT_TOOLBAR_ITEMS = 'quickimage quicktable';
-	var panel, currentRect;
-	var createToolbars = function (editor, toolbars) {
-		return Tools.map(toolbars, function (toolbar) {
-			return Toolbar.create(editor, toolbar.id, toolbar.items);
-		});
-	};
-	var getTextSelectionToolbarItems = function (settings) {
-		var value = settings.selection_toolbar;
-		return value ? value : DEFAULT_TEXT_SELECTION_ITEMS;
-	};
-	var getInsertToolbarItems = function (settings) {
-		var value = settings.insert_toolbar;
-		return value ? value : DEFAULT_INSERT_TOOLBAR_ITEMS;
-	};
+	return function () {
+		var DEFAULT_TEXT_SELECTION_ITEMS = 'bold italic | quicklink h2 h3 blockquote';
+		var DEFAULT_INSERT_TOOLBAR_ITEMS = 'quickimage quicktable';
+		var panel, currentRect;
+		var createToolbars = function (editor, toolbars) {
+			return Tools.map(toolbars, function (toolbar) {
+				return Toolbar.create(editor, toolbar.id, toolbar.items);
+			});
+		};
+		var getTextSelectionToolbarItems = function (settings) {
+			var value = settings.selection_toolbar;
+			return value ? value : DEFAULT_TEXT_SELECTION_ITEMS;
+		};
+		var getInsertToolbarItems = function (settings) {
+			var value = settings.insert_toolbar;
+			return value ? value : DEFAULT_INSERT_TOOLBAR_ITEMS;
+		};
+		var create = function (editor, toolbars) {
+			var items, settings = editor.settings;
+			items = createToolbars(editor, toolbars);
+			items = items.concat([
+				Toolbar.create(editor, 'text', getTextSelectionToolbarItems(settings)),
+				Toolbar.create(editor, 'insert', getInsertToolbarItems(settings)),
+				Forms.createQuickLinkForm(editor, hide)
+			]);
+			return Factory.create({
+				type: 'floatpanel',
+				role: 'dialog',
+				classes: 'tinymce tinymce-inline arrow',
+				ariaLabel: 'Inline toolbar',
+				layout: 'flex',
+				direction: 'column',
+				align: 'stretch',
+				autohide: false,
+				autofix: true,
+				fixed: true,
+				border: 1,
+				items: items,
+				oncancel: function() {
+					editor.focus();
+				}
+			});
+		};
-	var create = function (editor, toolbars) {
-		var items, settings = editor.settings;
-		items = createToolbars(editor, toolbars);
-		items = items.concat([
-			Toolbar.create(editor, 'text', getTextSelectionToolbarItems(settings)),
-			Toolbar.create(editor, 'insert', getInsertToolbarItems(settings)),
-			Forms.createQuickLinkForm(editor, hide)
-		]);
-		return Factory.create({
-			type: 'floatpanel',
-			role: 'dialog',
-			classes: 'tinymce tinymce-inline arrow',
-			ariaLabel: 'Inline toolbar',
-			layout: 'flex',
-			direction: 'column',
-			align: 'stretch',
-			autohide: false,
-			autofix: true,
-			fixed: true,
-			border: 1,
-			items: items,
-			oncancel: function() {
-				editor.focus();
+		var showPanel = function (panel) {
+			if (panel) {
+				panel.show();
 			}
-		});
-	};
+		};
-	var showPanel = function (panel) {
-		if (panel) {
-			panel.show();
-		}
-	};
+		var movePanelTo = function (panel, pos) {
+			panel.moveTo(pos.x, pos.y);
+		};
-	var movePanelTo = function (panel, pos) {
-		panel.moveTo(pos.x, pos.y);
-	};
+		var togglePositionClass = function (panel, relPos) {
+			relPos = relPos ? relPos.substr(0, 2) : '';
-	var togglePositionClass = function (panel, relPos) {
-		relPos = relPos ? relPos.substr(0, 2) : '';
-		Tools.each({
-			t: 'down',
-			b: 'up',
-			c: 'center'
-		}, function(cls, pos) {
-			panel.classes.toggle('arrow-' + cls, pos === relPos.substr(0, 1));
-		});
-		if (relPos === 'cr') {
-			panel.classes.toggle('arrow-left', true);
-			panel.classes.toggle('arrow-right', false);
-		} else if (relPos === 'cl') {
-			panel.classes.toggle('arrow-left', true);
-			panel.classes.toggle('arrow-right', true);
-		} else {
 			Tools.each({
-				l: 'left',
-				r: 'right'
+				t: 'down',
+				b: 'up',
+				c: 'center'
 			}, function(cls, pos) {
-				panel.classes.toggle('arrow-' + cls, pos === relPos.substr(1, 1));
+				panel.classes.toggle('arrow-' + cls, pos === relPos.substr(0, 1));
 			});
-		}
-	};
-	var showToolbar = function (panel, id) {
-		var toolbars = panel.items().filter('#' + id);
-		if (toolbars.length > 0) {
-			toolbars[0].show();
-			panel.reflow();
-		}
-	};
-	var showPanelAt = function (panel, id, editor, targetRect) {
-		var contentAreaRect, panelRect, result, userConstainHandler;
-		showPanel(panel);
-		panel.items().hide();
-		showToolbar(panel, id);
-		userConstainHandler = editor.settings.inline_toolbar_position_handler;
-		contentAreaRect = Measure.getContentAreaRect(editor);
-		panelRect = DOM.getRect(panel.getEl());
-		if (id === 'insert') {
-			result = Layout.calcInsert(targetRect, contentAreaRect, panelRect);
-		} else {
-			result = Layout.calc(targetRect, contentAreaRect, panelRect);
-		}
-		if (result) {
-			panelRect = result.rect;
-			currentRect = targetRect;
-			movePanelTo(panel, Layout.userConstrain(userConstainHandler, targetRect, contentAreaRect, panelRect));
-			togglePositionClass(panel, result.position);
-		} else {
-			hide(panel);
-		}
-	};
+			if (relPos === 'cr') {
+				panel.classes.toggle('arrow-left', true);
+				panel.classes.toggle('arrow-right', false);
+			} else if (relPos === 'cl') {
+				panel.classes.toggle('arrow-left', true);
+				panel.classes.toggle('arrow-right', true);
+			} else {
+				Tools.each({
+					l: 'left',
+					r: 'right'
+				}, function(cls, pos) {
+					panel.classes.toggle('arrow-' + cls, pos === relPos.substr(1, 1));
+				});
+			}
+		};
-	var hasFormVisible = function () {
-		return panel.items().filter('form:visible').length > 0;
-	};
+		var showToolbar = function (panel, id) {
+			var toolbars = panel.items().filter('#' + id);
-	var showForm = function (editor, id) {
-		if (panel) {
-			panel.items().hide();
-			showToolbar(panel, id);
+			if (toolbars.length > 0) {
+				toolbars[0].show();
+				panel.reflow();
+			}
+		};
+		var showPanelAt = function (panel, id, editor, targetRect) {
 			var contentAreaRect, panelRect, result, userConstainHandler;
 			showPanel(panel);
@@ -159,58 +124,95 @@ define('tinymce/inlite/ui/Panel', [
 			contentAreaRect = Measure.getContentAreaRect(editor);
 			panelRect = DOM.getRect(panel.getEl());
-			result = Layout.calc(currentRect, contentAreaRect, panelRect);
+			if (id === 'insert') {
+				result = Layout.calcInsert(targetRect, contentAreaRect, panelRect);
+			} else {
+				result = Layout.calc(targetRect, contentAreaRect, panelRect);
+			}
 			if (result) {
 				panelRect = result.rect;
-				movePanelTo(panel, Layout.userConstrain(userConstainHandler, currentRect, contentAreaRect, panelRect));
+				currentRect = targetRect;
+				movePanelTo(panel, Layout.userConstrain(userConstainHandler, targetRect, contentAreaRect, panelRect));
 				togglePositionClass(panel, result.position);
+			} else {
+				hide(panel);
 			}
-		}
-	};
+		};
-	var show = function (editor, id, targetRect, toolbars) {
-		if (!panel) {
-			panel = create(editor, toolbars);
-			panel.renderTo(document.body).reflow().moveTo(targetRect.x, targetRect.y);
-			editor.nodeChanged();
-		}
+		var hasFormVisible = function () {
+			return panel.items().filter('form:visible').length > 0;
+		};
-		showPanelAt(panel, id, editor, targetRect);
-	};
+		var showForm = function (editor, id) {
+			if (panel) {
+				panel.items().hide();
+				showToolbar(panel, id);
-	var hide = function () {
-		if (panel) {
-			panel.hide();
-		}
-	};
+				var contentAreaRect, panelRect, result, userConstainHandler;
-	var focus = function () {
-		if (panel) {
-			panel.find('toolbar:visible').eq(0).each(function (item) {
-				item.focus(true);
-			});
-		}
-	};
+				showPanel(panel);
+				panel.items().hide();
+				showToolbar(panel, id);
-	var remove = function () {
-		if (panel) {
-			panel.remove();
-			panel = null;
-		}
-	};
+				userConstainHandler = editor.settings.inline_toolbar_position_handler;
+				contentAreaRect = Measure.getContentAreaRect(editor);
+				panelRect = DOM.getRect(panel.getEl());
-	var inForm = function () {
-		return panel && panel.visible() && hasFormVisible();
-	};
+				result = Layout.calc(currentRect, contentAreaRect, panelRect);
-	return {
-		show: show,
-		showForm: showForm,
-		inForm: inForm,
-		hide: hide,
-		focus: focus,
-		remove: remove
+				if (result) {
+					panelRect = result.rect;
+					movePanelTo(panel, Layout.userConstrain(userConstainHandler, currentRect, contentAreaRect, panelRect));
+					togglePositionClass(panel, result.position);
+				}
+			}
+		};
+		var show = function (editor, id, targetRect, toolbars) {
+			if (!panel) {
+				panel = create(editor, toolbars);
+				panel.renderTo(document.body).reflow().moveTo(targetRect.x, targetRect.y);
+				editor.nodeChanged();
+			}
+			showPanelAt(panel, id, editor, targetRect);
+		};
+		var hide = function () {
+			if (panel) {
+				panel.hide();
+			}
+		};
+		var focus = function () {
+			if (panel) {
+				panel.find('toolbar:visible').eq(0).each(function (item) {
+					item.focus(true);
+				});
+			}
+		};
+		var remove = function () {
+			if (panel) {
+				panel.remove();
+				panel = null;
+			}
+		};
+		var inForm = function () {
+			return panel && panel.visible() && hasFormVisible();
+		};
+		return {
+			show: show,
+			showForm: showForm,
+			inForm: inForm,
+			hide: hide,
+			focus: focus,
+			remove: remove
+		};
 	};
 });