Changeset 3936:4ae4c187b41e for admin/js

Timestamp:

11/22/18 14:10:26 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Children:

3937:8783cf8c1236, 3949:47fa8f351f8a

Message:

Don't presume about jsToolBar existence!

Location:

admin/js

Files:

• _blog_pref.js (modified) (1 diff)
• _category.js (modified) (1 diff)
• _comment.js (modified) (1 diff)
• _index.js (modified) (3 diffs)

admin/js/_blog_pref.js

@@ -33 +33 @@
 
   // HTML text editor
-  if ($.isFunction(jsToolBar)) {
+  if (typeof jsToolBar !== 'undefined' && $.isFunction(jsToolBar)) {
     $('#blog_desc').each(function() {
       let tbWidgetText = new jsToolBar(this);

admin/js/_category.js

@@ -5 +5 @@
   dotclear.hideLockable();
 
-  if ($.isFunction(jsToolBar)) {
+  if (typeof jsToolBar !== 'undefined' && $.isFunction(jsToolBar)) {
     const tbCategory = new jsToolBar(document.getElementById('cat_desc'));
     tbCategory.draw('xhtml');

admin/js/_comment.js

@@ -3 +3 @@
 
 $(function() {
-     if ($.isFunction(jsToolBar)) {
+  if (typeof jsToolBar !== 'undefined' && $.isFunction(jsToolBar)) {
           const tbComment = new jsToolBar(document.getElementById('comment_content'));
           tbComment.draw('xhtml');

admin/js/_index.js

@@ -60 +60 @@
 $(function() {
   function quickPost(f, status) {
-    if ($.isFunction('jsToolBar') && (contentTb.getMode() == 'wysiwyg')) {
+    if (typeof jsToolBar !== 'undefined' && $.isFunction(jsToolBar) && contentTb.getMode() == 'wysiwyg') {
       contentTb.syncContents('iframe');
     }
@@ -96 +96 @@
         $('#post_content', f).val('');
         $('#post_content', f).change();
-        if ($.isFunction('jsToolBar') && (contentTb.getMode() == 'wysiwyg')) {
+        if (typeof jsToolBar !== 'undefined' && $.isFunction(jsToolBar) && contentTb.getMode() == 'wysiwyg') {
           contentTb.syncContents('textarea');
         }
@@ -110 +110 @@
   const f = $('#quick-entry');
   if (f.length > 0) {
-    if ($.isFunction(jsToolBar)) {
+    if (typeof jsToolBar !== 'undefined' && $.isFunction(jsToolBar)) {
       var contentTb = new jsToolBar($('#post_content', f)[0]);
       contentTb.switchMode($('#post_format', f).val());