From c41109f2f056b9dc175b36cf8ce3798cc101d6b1 Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Tue, 18 Nov 2014 16:20:58 +0100 Subject: [PATCH] [FIX] website_forum: Remove useless document ready Add select2 to frontend to allow public user to use tags --- .../static/src/js/website_forum.js | 18 +++++++----------- addons/website_forum/views/website_forum.xml | 4 ++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/addons/website_forum/static/src/js/website_forum.js b/addons/website_forum/static/src/js/website_forum.js index 3e632e3c412..47ff619815d 100644 --- a/addons/website_forum/static/src/js/website_forum.js +++ b/addons/website_forum/static/src/js/website_forum.js @@ -1,4 +1,3 @@ -$(document).ready(function () { openerp.website.if_dom_contains('.website_forum', function () { $('.karma_required').on('click', function (ev) { var karma = $(ev.currentTarget).data('karma'); @@ -218,7 +217,7 @@ $(document).ready(function () { editor.on('instanceReady', CKEDITORLoadComplete); } - IsKarmaValid = function(eventNumber, minKarma){ + function IsKarmaValid(eventNumber, minKarma){ "use strict"; if(parseInt($("#karma").val()) >= minKarma){ CKEDITOR.tools.callFunction(eventNumber,this); @@ -226,15 +225,12 @@ $(document).ready(function () { } else { alert("Sorry you need more than " + minKarma + " Karma."); } - }; + } - CKEDITORLoadComplete = function(){ + function CKEDITORLoadComplete(){ "use strict"; - $('.cke_button__link').attr('onclick','IsKarmaValid(33,30)'); - $('.cke_button__unlink').attr('onclick','IsKarmaValid(37,30)'); - $('.cke_button__image').attr('onclick','IsKarmaValid(41,30)'); - }; + $('.cke_button__link').on('click', function() { IsKarmaValid(33,30); }); + $('.cke_button__unlink').on('click', function() { IsKarmaValid(37,30); }); + $('.cke_button__image').on('click', function() { IsKarmaValid(41,30); }); + } }); -}); - - diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml index 4de52620f8b..31b666c1c5e 100644 --- a/addons/website_forum/views/website_forum.xml +++ b/addons/website_forum/views/website_forum.xml @@ -25,6 +25,10 @@ + +