Commit 9c16305b authored by webchick's avatar webchick
Browse files

Issue #2212283 by nod_: Auto-format JS files.

parent 7f555205
......@@ -107,7 +107,8 @@
// xmlhttp.responseText is going to throw an exception. So we'll catch it.
try {
responseText = "\n" + Drupal.t("ResponseText: !responseText", {'!responseText': $.trim(xmlhttp.responseText) });
} catch (e) {}
}
catch (e) {}
// Make the responseText more readable by stripping HTML tags and newlines.
responseText = responseText.replace(/<("[^"]*"|'[^']*'|[^'">])*>/gi, "");
......
......@@ -162,10 +162,10 @@
*
* @return {Object}
*/
function renderItem (ul, item) {
function renderItem(ul, item) {
return $("<li>")
.append( $("<a>").html(item.label))
.appendTo( ul );
.append($("<a>").html(item.label))
.appendTo(ul);
}
/**
......
......@@ -27,7 +27,7 @@
Drupal.dialog = function (element, options) {
function openDialog (settings) {
function openDialog(settings) {
settings = $.extend({}, drupalSettings.dialog, options, settings);
// Trigger a global event to allow scripts to bind events to the dialog.
$(window).trigger('dialog:beforecreate', [dialog, $element, settings]);
......@@ -36,7 +36,7 @@
$(window).trigger('dialog:aftercreate', [dialog, $element, settings]);
}
function closeDialog (value) {
function closeDialog(value) {
$(window).trigger('dialog:beforeclose', [dialog, $element]);
$element.dialog('close');
dialog.returnValue = value;
......
......@@ -62,7 +62,7 @@
'dialog:aftercreate': function (event, dialog, $element, settings) {
var autoResize = debounce(resetSize, 20);
var eventData = { settings: settings, $element: $element };
if (settings.autoResize === true || settings.autoResize === 'true') {
if (settings.autoResize === true || settings.autoResize === 'true') {
$element
.dialog('option', { resizable: false, draggable: false })
.dialog('widget').css('position', 'fixed');
......
......@@ -144,7 +144,6 @@
}
});
$.extend(Drupal.theme, {
/**
* A toggle is an interactive element often bound to a click handler.
......
......@@ -37,6 +37,7 @@ if (window.jQuery) {
}
this.message = messageList.join(' ; ');
}
DrupalBehaviorError.prototype = new Error();
/**
......
......@@ -116,7 +116,6 @@
}
};
/**
* Sends a 'formUpdated' event each time a form element is modified.
*/
......@@ -149,7 +148,6 @@
var contextIsForm = $context.is('form');
var $forms = (contextIsForm ? $context : $context.find('form')).once('form-updated');
if ($forms.length) {
// Initialize form behaviors, use $.makeArray to be able to use native
// forEach array method and have the callback parameters in the right order.
......
......@@ -109,5 +109,4 @@
}
});
})(jQuery);
......@@ -428,7 +428,6 @@
}
};
/**
* A state object is used for describing the state and performing aliasing.
*/
......@@ -552,23 +551,28 @@
}
});
/**
* These are helper functions implementing addition "operators" and don't
* implement any logic that is particular to states.
*/
// Bitwise AND with a third undefined state.
/**
* Bitwise AND with a third undefined state.
*/
function ternary(a, b) {
return typeof a === 'undefined' ? b : (typeof b === 'undefined' ? a : a && b);
}
// Inverts a (if it's not undefined) when invertState is true.
/**
* Inverts a (if it's not undefined) when invertState is true.
*/
function invert(a, invertState) {
return (invertState && typeof a !== 'undefined') ? !a : a;
}
// Compares two values while ignoring undefined values.
/**
* Compares two values while ignoring undefined values.
*/
function compare(a, b) {
return (a === b) ? (typeof a === 'undefined' ? a : true) : (typeof a === 'undefined' || typeof b === 'undefined');
}
......
......@@ -280,7 +280,6 @@
}
});
// Mark this behavior as processed on the first pass and return if it is
// already processed.
if (Drupal.tabbingManager) {
......@@ -288,5 +287,4 @@
}
Drupal.tabbingManager = new TabbingManager();
}(jQuery, Drupal));
......@@ -994,6 +994,7 @@
var currentRow = $(this.element, this.table).next('tr.draggable');
var rows = [];
var child = 0;
function rowIndentation(el, indentNum) {
var self = $(el);
if (child === 1 && (indentNum === parentIndentation)) {
......@@ -1006,6 +1007,7 @@
self.addClass('tree-child-horizontal');
}
}
while (currentRow.length) {
// A greater indentation indicates this is a child.
if (currentRow.find('.indentation').length > parentIndentation) {
......
......@@ -532,7 +532,7 @@
* A jQuery DOM fragment that represents the new button group. It has
* not been added to the DOM yet.
*/
function insertNewGroup (success, $group) {
function insertNewGroup(success, $group) {
if (success) {
$group.appendTo($(event.currentTarget).closest('.ckeditor-row').children('.ckeditor-toolbar-groups'));
// Focus on the new group.
......@@ -1171,7 +1171,7 @@
* A callback to invoke after the button group naming modal dialog has been
* closed.
*/
function registerButtonMove (view, $button, callback) {
function registerButtonMove(view, $button, callback) {
var $group = $button.closest('.ckeditor-toolbar-group');
// If dropped in a placeholder button group, the user must name it.
......@@ -1201,7 +1201,7 @@
* @param jQuery $group
* A jQuery set that contains an li element that wraps a group of buttons.
*/
function registerGroupMove (view, $group) {
function registerGroupMove(view, $group) {
// Remove placeholder classes if necessary.
var $row = $group.closest('.ckeditor-row');
if ($row.hasClass('placeholder')) {
......@@ -1229,7 +1229,7 @@
* A callback to invoke after the button group naming modal dialog has been
* closed.
*/
function openGroupNameDialog (view, $group, callback) {
function openGroupNameDialog(view, $group, callback) {
callback = callback || function () {};
/**
......@@ -1241,7 +1241,7 @@
* @return Boolean
* Returns true when an error exists, otherwise returns false.
*/
function validateForm (form) {
function validateForm(form) {
if (form.elements[0].value.length === 0) {
var $form = $(form);
if (!$form.hasClass('errors')) {
......@@ -1266,12 +1266,12 @@
* The form DOM element that contains the input with the new button group
* title string.
*/
function closeDialog (action, form) {
function closeDialog(action, form) {
/**
* Closes the dialog when the user cancels or supplies valid data.
*/
function shutdown () {
function shutdown() {
dialog.close(action);
// The processing marker can be deleted since the dialog has been closed.
......@@ -1286,7 +1286,7 @@
* @param String name
* The new name of the CKEditor button group.
*/
function namePlaceholderGroup ($group, name) {
function namePlaceholderGroup($group, name) {
// If it's currently still a placeholder, then that means we're creating
// a new group, and we must do some extra work.
if ($group.hasClass('placeholder')) {
......
......@@ -30,12 +30,13 @@
var stylesSet = that._generateStylesSetSetting(styles);
if (!_.isEqual(previousStylesSet, stylesSet)) {
previousStylesSet = stylesSet;
$ckeditorActiveToolbar.trigger('CKEditorPluginSettingsChanged', [{ stylesSet: stylesSet }]);
$ckeditorActiveToolbar.trigger('CKEditorPluginSettingsChanged', [
{ stylesSet: stylesSet }
]);
}
});
},
/**
* Builds the "stylesSet" configuration part of the CKEditor JS settings.
*
......
......@@ -80,7 +80,7 @@
widgetDefinition._dataToDialogValues = function (data) {
var dialogValues = {};
var map = widgetDefinition._mapDataToDialog;
Object.keys(widgetDefinition._mapDataToDialog).forEach(function(key) {
Object.keys(widgetDefinition._mapDataToDialog).forEach(function (key) {
dialogValues[map[key]] = data[key];
});
return dialogValues;
......@@ -90,7 +90,7 @@
widgetDefinition._dialogValuesToData = function (dialogReturnValues) {
var data = {};
var map = widgetDefinition._mapDataToDialog;
Object.keys(widgetDefinition._mapDataToDialog).forEach(function(key) {
Object.keys(widgetDefinition._mapDataToDialog).forEach(function (key) {
if (dialogReturnValues.hasOwnProperty(map[key])) {
data[key] = dialogReturnValues[map[key]];
}
......@@ -177,7 +177,7 @@
editor.addCommand('editdrupalimage', {
allowedContent: 'img[alt,!src,width,height,!data-editor-file-uuid]',
requiredContent: 'img[alt,src,width,height,data-editor-file-uuid]',
modes: { wysiwyg : 1 },
modes: { wysiwyg: 1 },
canUndo: true,
exec: function (editor, data) {
var dialogSettings = {
......@@ -234,7 +234,7 @@
});
function isImageWidget (editor, element) {
function isImageWidget(editor, element) {
var widget = editor.widgets.getByElement(element.getChild(0), true);
return widget && widget.name === 'image';
}
......
......@@ -58,10 +58,10 @@
// attributes.
widgetDefinition.downcast = function (element) {
// Find an image element in the one being downcasted (can be itself).
var img = findElementByName(element, 'img'),
caption = this.editables.caption,
captionHtml = caption && caption.getData(),
attrs = img.attributes;
var img = findElementByName(element, 'img');
var caption = this.editables.caption;
var captionHtml = caption && caption.getData();
var attrs = img.attributes;
// If image contains a non-empty caption, serialize caption to the
// data-caption attribute.
......@@ -91,8 +91,8 @@
return;
}
var attrs = element.attributes,
retElement = element;
var attrs = element.attributes;
var retElement = element;
// We won't need the attributes during editing: we'll use widget.data
// to store them (except the caption, which is stored in the DOM).
......@@ -107,9 +107,9 @@
// Captioned image will be transformed to <figure>, so we don't want
// the <p> anymore.
if (element.parent.name === 'p' && caption) {
var index = element.getIndex(),
splitBefore = index > 0,
splitAfter = index + 1 < element.parent.children.length;
var index = element.getIndex();
var splitBefore = index > 0;
var splitAfter = index + 1 < element.parent.children.length;
if (splitBefore) {
element.parent.split(index);
......@@ -203,7 +203,7 @@
* @param String name
* @return CKEDITOR.htmlParser.element
*/
function findElementByName (element, name) {
function findElementByName(element, name) {
if (element.name === name) {
return element;
}
......
......@@ -192,7 +192,6 @@
}
});
/**
* Get the surrounding link element of current selection.
*
......
......@@ -113,6 +113,7 @@
}
}
}
if (drupalSettings.comment && drupalSettings.comment.newCommentsLinks) {
render(drupalSettings.comment.newCommentsLinks.node[fieldName]);
}
......
......@@ -41,7 +41,7 @@
* @param string html
* The server-side rendered HTML for this contextual link.
*/
function initContextual ($contextual, html) {
function initContextual($contextual, html) {
var $region = $contextual.closest('.contextual-region');
var contextual = Drupal.contextual;
......@@ -101,7 +101,7 @@
* A contextual links placeholder DOM element, containing the actual
* contextual links as rendered by the server.
*/
function adjustIfNestedAndOverlapping ($contextual) {
function adjustIfNestedAndOverlapping($contextual) {
var $contextuals = $contextual
// @todo confirm that .closest() is not sufficient
.parents('.contextual-region').eq(-1)
......@@ -156,7 +156,7 @@
});
// Update all contextual links placeholders whose HTML is cached.
var uncachedIDs = _.filter(ids, function initIfCached (contextualID) {
var uncachedIDs = _.filter(ids, function initIfCached(contextualID) {
var html = storage.getItem('Drupal.contextual.' + contextualID);
if (html !== null) {
// Initialize after the current executation cycle, to make the AJAX
......
......@@ -25,7 +25,6 @@
tabbingContext: null
},
/**
* {@inheritdoc}
*
......
......@@ -259,7 +259,7 @@
* A callback to be called (with no parameters) after the field's value has
* been XSS filtered.
*/
function filterXssWhenSwitching (field, format, originalFormatID, callback) {
function filterXssWhenSwitching(field, format, originalFormatID, callback) {
// A text editor that already is XSS-safe needs no additional measures.
if (format.editor.isXssSafe) {
callback(field, format);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment