From 097240a0bc7a49db293005b36212cc2010c8410b Mon Sep 17 00:00:00 2001 From: webchick Date: Wed, 25 Feb 2015 22:28:39 -0800 Subject: [PATCH] Issue #2428041 by nod_: Update eslint config for 0.14.1 --- .eslintrc | 1 + core/modules/ckeditor/js/ckeditor.admin.js | 15 +++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.eslintrc b/.eslintrc index c8eb79f169f..d371f58acf6 100644 --- a/.eslintrc +++ b/.eslintrc @@ -21,6 +21,7 @@ "comma-style": [2, "last"], "eqeqeq": [2, "smart"], "guard-for-in": 2, + "indent": [2, 2, {"indentSwitchCase": true}], "key-spacing": [2, {"beforeColon": false, "afterColon": true}], "no-implied-eval": 2, "no-mixed-spaces-and-tabs": 2, diff --git a/core/modules/ckeditor/js/ckeditor.admin.js b/core/modules/ckeditor/js/ckeditor.admin.js index 671313ac5ee..e3dbf2b258a 100644 --- a/core/modules/ckeditor/js/ckeditor.admin.js +++ b/core/modules/ckeditor/js/ckeditor.admin.js @@ -99,17 +99,16 @@ // If dropped in a placeholder button group, the user must name it. if ($group.hasClass('placeholder')) { + if (view.isProcessing) { + return; + } + view.isProcessing = true; - if (view.isProcessing) { - return; - } - view.isProcessing = true; - - Drupal.ckeditor.openGroupNameDialog(view, $group, callback); + Drupal.ckeditor.openGroupNameDialog(view, $group, callback); } else { - view.model.set('isDirty', true); - callback(true); + view.model.set('isDirty', true); + callback(true); } },