img.src = url;
}
- function applyPreview(items) {
- tinymce.each(items, function(item) {
- item.textStyle = function() {
- return editor.formatter.getCssText({inline: 'img', classes: [item.value]});
- };
- });
+ function buildListItems(inputList, itemCallback, startItems) {
+ function appendItems(values, output) {
+ output = output || [];
+
+ tinymce.each(values, function(item) {
+ var menuItem = {text: item.text || item.title};
+
+ if (item.menu) {
+ menuItem.menu = appendItems(item.menu);
+ } else {
+ menuItem.value = item.value;
+ itemCallback(menuItem);
+ }
+
+ output.push(menuItem);
+ });
+
+ return output;
+ }
- return items;
+ return appendItems(inputList, startItems || []);
}
function createImageList(callback) {
return function() {
var imageList = editor.settings.image_list;
- if (typeof(imageList) == "string") {
+ if (typeof imageList == "string") {
tinymce.util.XHR.send({
url: imageList,
success: function(text) {
callback(tinymce.util.JSON.parse(text));
}
});
+ } else if (typeof imageList == "function") {
+ imageList(callback);
} else {
callback(imageList);
}
function showDialog(imageList) {
var win, data = {}, dom = editor.dom, imgElm = editor.selection.getNode();
- var width, height, imageListCtrl, classListCtrl;
-
- function buildValues(listSettingName, dataItemName, defaultItems) {
- var selectedItem, items = [];
-
- tinymce.each(editor.settings[listSettingName] || defaultItems, function(target) {
- var item = {
- text: target.text || target.title,
- value: target.value
- };
-
- items.push(item);
-
- if (data[dataItemName] === target.value || (!selectedItem && target.selected)) {
- selectedItem = item;
- }
- });
-
- if (selectedItem && !data[dataItemName]) {
- data[dataItemName] = selectedItem.value;
- selectedItem.selected = true;
- }
-
- return items;
- }
-
- function buildImageList() {
- var imageListItems = [{text: 'None', value: ''}];
-
- tinymce.each(imageList, function(image) {
- imageListItems.push({
- text: image.text || image.title,
- value: editor.convertURL(image.value || image.url, 'src'),
- menu: image.menu
- });
- });
-
- return imageListItems;
- }
+ var width, height, imageListCtrl, classListCtrl, imageDimensions = editor.settings.image_dimensions !== false;
function recalcSize() {
var widthCtrl, heightCtrl, newWidth, newHeight;
widthCtrl = win.find('#width')[0];
heightCtrl = win.find('#height')[0];
+ if (!widthCtrl || !heightCtrl) {
+ return;
+ }
+
newWidth = widthCtrl.value();
newHeight = heightCtrl.value();
if (win.find('#constrain')[0].checked() && width && height && newWidth && newHeight) {
if (width != newWidth) {
newHeight = Math.round((newWidth / width) * newHeight);
- heightCtrl.value(newHeight);
+
+ if (!isNaN(newHeight)) {
+ heightCtrl.value(newHeight);
+ }
} else {
newWidth = Math.round((newHeight / height) * newWidth);
- widthCtrl.value(newWidth);
+
+ if (!isNaN(newWidth)) {
+ widthCtrl.value(newWidth);
+ }
}
}
function waitLoad(imgElm) {
function selectImage() {
imgElm.onload = imgElm.onerror = null;
- editor.selection.select(imgElm);
- editor.nodeChanged();
+
+ if (editor.selection) {
+ editor.selection.select(imgElm);
+ editor.nodeChanged();
+ }
}
imgElm.onload = function() {
- if (!data.width && !data.height) {
+ if (!data.width && !data.height && imageDimensions) {
dom.setAttribs(imgElm, {
width: imgElm.clientWidth,
height: imgElm.clientHeight
data.alt = '';
}
+ if (!data.title) {
+ data.title = '';
+ }
+
if (data.width === '') {
data.width = null;
}
data.height = null;
}
- if (data.style === '') {
+ if (!data.style) {
data.style = null;
}
+ // Setup new data excluding style properties
+ /*eslint dot-notation: 0*/
data = {
src: data.src,
alt: data.alt,
+ title: data.title,
width: data.width,
height: data.height,
style: data.style,
"class": data["class"]
};
- if (!data["class"]) {
- delete data["class"];
- }
-
editor.undoManager.transact(function() {
// WP
var eventData = { node: imgElm, data: data, caption: caption };
return;
}
+ if (data.title === "") {
+ data.title = null;
+ }
+
if (!imgElm) {
data.id = '__mcenew';
editor.focus();
return value;
}
- function srcChange() {
+ function srcChange(e) {
+ var srcURL, prependURL, absoluteURLPattern, meta = e.meta || {};
+
if (imageListCtrl) {
imageListCtrl.value(editor.convertURL(this.value(), 'src'));
}
- getImageSize(this.value(), function(data) {
- if (data.width && data.height) {
- width = data.width;
- height = data.height;
+ tinymce.each(meta, function(value, key) {
+ win.find('#' + key).value(value);
+ });
+
+ if (!meta.width && !meta.height) {
+ srcURL = editor.convertURL(this.value(), 'src');
- win.find('#width').value(width);
- win.find('#height').value(height);
+ // Pattern test the src url and make sure we haven't already prepended the url
+ prependURL = editor.settings.image_prepend_url;
+ absoluteURLPattern = new RegExp('^(?:[a-z]+:)?//', 'i');
+ if (prependURL && !absoluteURLPattern.test(srcURL) && srcURL.substring(0, prependURL.length) !== prependURL) {
+ srcURL = prependURL + srcURL;
}
- });
+
+ this.value(srcURL);
+
+ getImageSize(editor.documentBaseURI.toAbsolute(this.value()), function(data) {
+ if (data.width && data.height && imageDimensions) {
+ width = data.width;
+ height = data.height;
+
+ win.find('#width').value(width);
+ win.find('#height').value(height);
+ }
+ });
+ }
}
width = dom.getAttrib(imgElm, 'width');
data = {
src: dom.getAttrib(imgElm, 'src'),
alt: dom.getAttrib(imgElm, 'alt'),
+ title: dom.getAttrib(imgElm, 'title'),
"class": dom.getAttrib(imgElm, 'class'),
width: width,
height: height
imageListCtrl = {
type: 'listbox',
label: 'Image list',
- values: buildImageList(),
+ values: buildListItems(
+ imageList,
+ function(item) {
+ item.value = editor.convertURL(item.value || item.url, 'src');
+ },
+ [{text: 'None', value: ''}]
+ ),
value: data.src && editor.convertURL(data.src, 'src'),
onselect: function(e) {
var altCtrl = win.find('#alt');
altCtrl.value(e.control.text());
}
- win.find('#src').value(e.control.value());
+ win.find('#src').value(e.control.value()).fire('change');
},
onPostRender: function() {
imageListCtrl = this;
name: 'class',
type: 'listbox',
label: 'Class',
- values: applyPreview(buildValues('image_class_list', 'class'))
+ values: buildListItems(
+ editor.settings.image_class_list,
+ function(item) {
+ if (item.value) {
+ item.textStyle = function() {
+ return editor.formatter.getCssText({inline: 'img', classes: [item.value]});
+ };
+ }
+ }
+ )
};
}
// General settings shared between simple and advanced dialogs
var generalFormItems = [
- {name: 'src', type: 'filepicker', filetype: 'image', label: 'Source', autofocus: true, onchange: srcChange},
+ {
+ name: 'src',
+ type: 'filepicker',
+ filetype: 'image',
+ label: 'Source',
+ autofocus: true,
+ onchange: srcChange
+ },
imageListCtrl
];
generalFormItems.push({name: 'alt', type: 'textbox', label: 'Image description'});
}
- if (editor.settings.image_dimensions !== false) {
+ if (editor.settings.image_title) {
+ generalFormItems.push({name: 'title', type: 'textbox', label: 'Image Title'});
+ }
+
+ if (imageDimensions) {
generalFormItems.push({
type: 'container',
label: 'Dimensions',
// WP
editor.fire( 'wpLoadImageForm', { data: generalFormItems } );
+ function mergeMargins(css) {
+ if (css.margin) {
+
+ var splitMargin = css.margin.split(" ");
+
+ switch (splitMargin.length) {
+ case 1: //margin: toprightbottomleft;
+ css['margin-top'] = css['margin-top'] || splitMargin[0];
+ css['margin-right'] = css['margin-right'] || splitMargin[0];
+ css['margin-bottom'] = css['margin-bottom'] || splitMargin[0];
+ css['margin-left'] = css['margin-left'] || splitMargin[0];
+ break;
+ case 2: //margin: topbottom rightleft;
+ css['margin-top'] = css['margin-top'] || splitMargin[0];
+ css['margin-right'] = css['margin-right'] || splitMargin[1];
+ css['margin-bottom'] = css['margin-bottom'] || splitMargin[0];
+ css['margin-left'] = css['margin-left'] || splitMargin[1];
+ break;
+ case 3: //margin: top rightleft bottom;
+ css['margin-top'] = css['margin-top'] || splitMargin[0];
+ css['margin-right'] = css['margin-right'] || splitMargin[1];
+ css['margin-bottom'] = css['margin-bottom'] || splitMargin[2];
+ css['margin-left'] = css['margin-left'] || splitMargin[1];
+ break;
+ case 4: //margin: top right bottom left;
+ css['margin-top'] = css['margin-top'] || splitMargin[0];
+ css['margin-right'] = css['margin-right'] || splitMargin[1];
+ css['margin-bottom'] = css['margin-bottom'] || splitMargin[2];
+ css['margin-left'] = css['margin-left'] || splitMargin[3];
+ }
+ delete css.margin;
+ }
+ return css;
+ }
+
function updateStyle() {
function addPixelSuffix(value) {
if (value.length > 0 && /^[0-9]+$/.test(value)) {
return;
}
- var data = win.toJSON();
- var css = dom.parseStyle(data.style);
+ var data = win.toJSON(),
+ css = dom.parseStyle(data.style);
- delete css.margin;
- css['margin-top'] = css['margin-bottom'] = addPixelSuffix(data.vspace);
- css['margin-left'] = css['margin-right'] = addPixelSuffix(data.hspace);
- css['border-width'] = addPixelSuffix(data.border);
+ css = mergeMargins(css);
+
+ if (data.vspace) {
+ css['margin-top'] = css['margin-bottom'] = addPixelSuffix(data.vspace);
+ }
+ if (data.hspace) {
+ css['margin-left'] = css['margin-right'] = addPixelSuffix(data.hspace);
+ }
+ if (data.border) {
+ css['border-width'] = addPixelSuffix(data.border);
+ }
win.find('#style').value(dom.serializeStyle(dom.parseStyle(dom.serializeStyle(css))));
}
+ function updateVSpaceHSpaceBorder() {
+ if (!editor.settings.image_advtab) {
+ return;
+ }
+
+ var data = win.toJSON(),
+ css = dom.parseStyle(data.style);
+
+ win.find('#vspace').value("");
+ win.find('#hspace').value("");
+
+ css = mergeMargins(css);
+
+ //Move opposite equal margins to vspace/hspace field
+ if ((css['margin-top'] && css['margin-bottom']) || (css['margin-right'] && css['margin-left'])) {
+ if (css['margin-top'] === css['margin-bottom']) {
+ win.find('#vspace').value(removePixelSuffix(css['margin-top']));
+ } else {
+ win.find('#vspace').value('');
+ }
+ if (css['margin-right'] === css['margin-left']) {
+ win.find('#hspace').value(removePixelSuffix(css['margin-right']));
+ } else {
+ win.find('#hspace').value('');
+ }
+ }
+
+ //Move border-width
+ if (css['border-width']) {
+ win.find('#border').value(removePixelSuffix(css['border-width']));
+ }
+
+ win.find('#style').value(dom.serializeStyle(dom.parseStyle(dom.serializeStyle(css))));
+
+ }
+
if (editor.settings.image_advtab) {
// Parse styles from img
if (imgElm) {
- data.hspace = removePixelSuffix(imgElm.style.marginLeft || imgElm.style.marginRight);
- data.vspace = removePixelSuffix(imgElm.style.marginTop || imgElm.style.marginBottom);
- data.border = removePixelSuffix(imgElm.style.borderWidth);
+ if (imgElm.style.marginLeft && imgElm.style.marginRight && imgElm.style.marginLeft === imgElm.style.marginRight) {
+ data.hspace = removePixelSuffix(imgElm.style.marginLeft);
+ }
+ if (imgElm.style.marginTop && imgElm.style.marginBottom && imgElm.style.marginTop === imgElm.style.marginBottom) {
+ data.vspace = removePixelSuffix(imgElm.style.marginTop);
+ }
+ if (imgElm.style.borderWidth) {
+ data.border = removePixelSuffix(imgElm.style.borderWidth);
+ }
+
data.style = editor.dom.serializeStyle(editor.dom.parseStyle(editor.dom.getAttrib(imgElm, 'style')));
}
{
label: 'Style',
name: 'style',
- type: 'textbox'
+ type: 'textbox',
+ onchange: updateVSpaceHSpaceBorder
},
{
type: 'form',
}
}
- // WP
- editor.addCommand( 'mceImage', function() {
- createImageList( showDialog )();
- });
-
editor.addButton('image', {
icon: 'image',
tooltip: 'Insert/edit image',
editor.addMenuItem('image', {
icon: 'image',
- text: 'Insert image',
+ text: 'Insert/edit image',
onclick: createImageList(showDialog),
context: 'insert',
prependToContext: true
});
+
+ editor.addCommand('mceImage', createImageList(showDialog));
});
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff