From ed74e590b5d937d6196fc48876118b6592d8f056 Mon Sep 17 00:00:00 2001 From: pichalite Date: Sun, 17 Jan 2016 00:04:04 -0800 Subject: [PATCH] Revert "fixes for rewards ACP page #3910" This reverts commit 0c740293fc3ed0864803f00b02a4300848ceb15b. --- public/src/admin/extend/rewards.js | 6 +++--- src/rewards/admin.js | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index 595eb6678a..d93741d76b 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -41,10 +41,10 @@ define('admin/extend/rewards', function() { }) .on('click', '.toggle', function() { var btn = $(this), - disabled = btn.hasClass('btn-success'), + disabled = btn.html() === 'Enable', id = $(this).parents('[data-id]').attr('data-id'); - btn.toggleClass('btn-warning').toggleClass('btn-success').html(disabled ? 'Disable' : 'Enable'); + btn.toggleClass('btn-warning').toggleClass('btn-success').html(disabled ? 'Enable' : 'Disable'); // send disable api call return false; }); @@ -165,7 +165,7 @@ define('admin/extend/rewards', function() { }); data.id = $(this).attr('data-id'); - data.disabled = $(this).find('.toggle').hasClass('btn-success'); + data.disabled = $(this).find('.toggle').html() === 'Enable'; activeRewards.push(data); }); diff --git a/src/rewards/admin.js b/src/rewards/admin.js index 722cac1ee5..fac78bfeec 100644 --- a/src/rewards/admin.js +++ b/src/rewards/admin.js @@ -115,7 +115,6 @@ function getActiveRewards(callback) { } }, function(err, data) { if (data.main) { - data.main.disabled = data.main.disabled === 'true'; data.main.rewards = data.rewards; activeRewards.push(data.main); }