CRM-16354 more style changes

diff --git a/js/Common.js b/js/Common.js
index 1f0b3a126218ace3fdf3b280c283cb96b2f66652..1ce6ee921a493493d213380296f51eadd77687bf 100644 (file)
--- a/js/Common.js
+++ b/js/Common.js
@@ -838,8 +838,8 @@ CRM.strings = CRM.strings || {};
         } else {
           CRM.wysiwyg.create(this);
         }
-      })
-    });
+      });
+    })
     .on('dialogopen', function(e) {
       var $el = $(e.target);
       // Modal dialogs should disable scrollbars

diff --git a/js/wysiwyg/crm.textarea.js b/js/wysiwyg/crm.textarea.js
deleted file mode 100644 (file)
index 2810253..0000000
--- a/js/wysiwyg/crm.textarea.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// https://civicrm.org/licensing
-(function($, _) {
-  function openWysiwyg(item) {
-    $(item).show();
-    $(item).next('.replace-plain').hide();
-    CRM.wysiwyg.create(item);
-    $(item).on( 'blur', function( e ) {
-      CRM.wysiwyg.updateElement(item);
-      CRM.wysiwyg.destroy(item);
-      $(item).hide().next('.replace-plain').show().html($(item).val());
-    });
-  }
-  CRM.wysiwyg = {};
-  CRM.wysiwyg.supportsFileUploads =  false;
-  CRM.wysiwyg.create = _.noop;
-  CRM.wysiwyg.destroy = _.noop;
-  CRM.wysiwyg.updateElement = _.noop;
-  CRM.wysiwyg.val = function(item) {
-    return $(item).val();
-  };
-  CRM.wysiwyg.insertText = _.noop;
-  CRM.wysiwyg.insertHTML = _.noop;
-  CRM.wysiwyg.createPlain = function(item) {
-    $(item)
-      .hide()
-      .after('<div class="replace-plain" tabindex="0" title="Click to edit"></div>');
-    $(item).next('.replace-plain').click(function(){
-      openWysiwyg(item);
-    });
-    $(item).next('.replace-plain').keypress(function(){
-      openWysiwyg(item);
-    });
-  };
-})(CRM.$, CRM._);

diff --git a/js/wysiwyg/crm.wysiwyg.js b/js/wysiwyg/crm.wysiwyg.js
index b729e443566ff483930cf4171deb3b5d19465716..28102538a23ce2d5c9ae0545bf33df106d5ad70a 100644 (file)
--- a/js/wysiwyg/crm.wysiwyg.js
+++ b/js/wysiwyg/crm.wysiwyg.js
@@ -9,9 +9,9 @@
       CRM.wysiwyg.destroy(item);
       $(item).hide().next('.replace-plain').show().html($(item).val());
     });
-  };
+  }
   CRM.wysiwyg = {};
-  CRM.wysiwyg['supportsFileUploads'] =  false;
+  CRM.wysiwyg.supportsFileUploads =  false;
   CRM.wysiwyg.create = _.noop;
   CRM.wysiwyg.destroy = _.noop;
   CRM.wysiwyg.updateElement = _.noop;