From 33f8970a1737730e65713b40c4e5892e8e00224a Mon Sep 17 00:00:00 2001 From: Christophe Maudoux Date: Wed, 24 Apr 2019 12:15:49 +0200 Subject: [PATCH] Improve JS code (#1689) --- .../site/coffee/favapps.coffee | 37 +++++++------------ .../site/htdocs/static/common/js/favapps.js | 31 +++++++--------- .../htdocs/static/common/js/favapps.min.js | 2 +- 3 files changed, 27 insertions(+), 43 deletions(-) diff --git a/lemonldap-ng-portal/site/coffee/favapps.coffee b/lemonldap-ng-portal/site/coffee/favapps.coffee index 7bdced20c..a792c829f 100644 --- a/lemonldap-ng-portal/site/coffee/favapps.coffee +++ b/lemonldap-ng-portal/site/coffee/favapps.coffee @@ -3,42 +3,31 @@ LemonLDAP::NG Favorite Applications script ### # FavApps function (launched by "star" icon) -FavApps = (star, appuri) -> +FavApps = (star) -> $.ajax type: "POST" url: "#{portal}favapps" data: - app: appuri - logo: logo - title: title + app: star.attr 'appuri' + logo: star.attr 'logo' + desc: star.attr 'desc' + title: star.attr 'title' dataType: 'json' - #error: star.attr('src', 'static/common/icons/star0.png') success: (resp) -> if resp.error - #console.log 'Error' - #star.attr('src', 'static/common/icons/star0.png') - switchStar star, '0' + console.log 'Error' + switchStar star, 0 else if resp.result - #console.log 'OK' - #star.attr('src', 'static/common/icons/star1.png') - switchStar star, '1' + console.log 'App. registered' + switchStar star, 1 else - #console.log 'NOK' - #star.attr('src', 'static/common/icons/star0.png') - switchStar star, '-1' + console.log 'App. unregistered' + switchStar star, 0 #error: switchStar star, '0' switchStar = (star, status) -> - if status == '1' - console.log 'OK' - star.attr('src', 'static/common/icons/star1.png') - else if status == '-1' - console.log 'NOK' - star.attr('src', 'static/common/icons/star0.png') - else - console.log 'Error' - star.attr('src', 'static/common/icons/star0.png') + star.attr('src', "#{window.staticPrefix}common/icons/star#{status}.png") # Switch "star" events $(document).ready -> - $('body').on 'click', '.star', () -> FavApps $(this), ( $(this).attr 'appuri' ) + $('body').on 'click', '.star', () -> FavApps $(this) diff --git a/lemonldap-ng-portal/site/htdocs/static/common/js/favapps.js b/lemonldap-ng-portal/site/htdocs/static/common/js/favapps.js index 72897cd97..9c5050158 100644 --- a/lemonldap-ng-portal/site/htdocs/static/common/js/favapps.js +++ b/lemonldap-ng-portal/site/htdocs/static/common/js/favapps.js @@ -7,44 +7,39 @@ LemonLDAP::NG Favorite Applications script (function() { var FavApps, switchStar; - FavApps = function(star, appuri) { + FavApps = function(star) { return $.ajax({ type: "POST", url: portal + "favapps", data: { - app: appuri, - logo: logo, - title: title + app: star.attr('appuri'), + logo: star.attr('logo'), + desc: star.attr('desc'), + title: star.attr('title') }, dataType: 'json', success: function(resp) { if (resp.error) { - return switchStar(star, '0'); + console.log('Error'); + return switchStar(star, 0); } else if (resp.result) { - return switchStar(star, '1'); + console.log('App. registered'); + return switchStar(star, 1); } else { - return switchStar(star, '-1'); + console.log('App. unregistered'); + return switchStar(star, 0); } } }); }; switchStar = function(star, status) { - if (status === '1') { - console.log('OK'); - return star.attr('src', 'static/common/icons/star1.png'); - } else if (status === '-1') { - console.log('NOK'); - return star.attr('src', 'static/common/icons/star0.png'); - } else { - console.log('Error'); - return star.attr('src', 'static/common/icons/star0.png'); - } + return star.attr('src', window.staticPrefix + "common/icons/star" + status + ".png"); }; $(document).ready(function() { return $('body').on('click', '.star', function() { - return FavApps($(this), $(this).attr('appuri')); + return FavApps($(this)); }); }); diff --git a/lemonldap-ng-portal/site/htdocs/static/common/js/favapps.min.js b/lemonldap-ng-portal/site/htdocs/static/common/js/favapps.min.js index d07decd55..e7fe7b43b 100644 --- a/lemonldap-ng-portal/site/htdocs/static/common/js/favapps.min.js +++ b/lemonldap-ng-portal/site/htdocs/static/common/js/favapps.min.js @@ -1 +1 @@ -(function(){var FavApps,switchStar;FavApps=function(star,appuri){return $.ajax({type:"POST",url:portal+"favapps",data:{app:appuri,logo:logo,title:title},dataType:"json",success:function(resp){if(resp.error){return switchStar(star,"0")}else if(resp.result){return switchStar(star,"1")}else{return switchStar(star,"-1")}}})};switchStar=function(star,status){if(status==="1"){console.log("OK");return star.attr("src","static/common/icons/star1.png")}else if(status==="-1"){console.log("NOK");return star.attr("src","static/common/icons/star0.png")}else{console.log("Error");return star.attr("src","static/common/icons/star0.png")}};$(document).ready(function(){return $("body").on("click",".star",function(){return FavApps($(this),$(this).attr("appuri"))})})}).call(this); +(function(){var FavApps,switchStar;FavApps=function(star){return $.ajax({type:"POST",url:portal+"favapps",data:{app:star.attr("appuri"),logo:star.attr("logo"),desc:star.attr("desc"),title:star.attr("title")},dataType:"json",success:function(resp){if(resp.error){console.log("Error");return switchStar(star,0)}else if(resp.result){console.log("App. registered");return switchStar(star,1)}else{console.log("App. unregistered");return switchStar(star,0)}}})};switchStar=function(star,status){return star.attr("src",window.staticPrefix+"common/icons/star"+status+".png")};$(document).ready(function(){return $("body").on("click",".star",function(){return FavApps($(this))})})}).call(this);