Ensure inline language setting takes precedence for CKEditor

visionappscz · Jun 24, 2016 · 572d7d5 · 572d7d5
1 parent fd47a0d
commit 572d7d5
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/js/ckeditor-loader.js b/src/js/ckeditor-loader.js
@@ -14,6 +14,10 @@
         var $this = $(this);
         var confValue = $this.data('onload-ckeditor');
 
+        if (language) {
+          confObj.language = language;
+        }
+
         if (confValue) {
           if (typeof confValue === 'object') {
             confObj = confValue;
@@ -22,10 +26,6 @@
           }
         }
 
-        if (language) {
-          confObj.language = language;
-        }
-
         $this.ckeditor(confObj);
       });
     });