From: Tyrell Cook Date: Sun, 26 Apr 2015 20:56:37 +0000 (-0400) Subject: CRM-16354 more style changes X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a5a0ed13c192c65df4998198967b7a16258b9045;p=civicrm-core.git CRM-16354 more style changes --- diff --git a/js/Common.js b/js/Common.js index 1f0b3a1262..1ce6ee921a 100644 --- 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 index 28102538a2..0000000000 --- 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('
'); - $(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 b729e44356..28102538a2 100644 --- 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;