From ee377b160ea94cd79d5e60c9b46d7cb1648f2624 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 23 Feb 2015 14:55:59 -0500 Subject: [PATCH] #2751 fixes syntax error on acp/ajaxify --- public/src/admin/extend/rewards.js | 78 +++++++++++++++--------------- 1 file changed, 38 insertions(+), 40 deletions(-) diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js index 7fc023eda5..45e81cc289 100644 --- a/public/src/admin/extend/rewards.js +++ b/public/src/admin/extend/rewards.js @@ -11,50 +11,48 @@ define('admin/extend/rewards', function() { conditionals; rewards.init = function() { - $(window).on('action:ajaxify.end', function() { - available = JSON.parse(ajaxify.variables.get('rewards')); - active = JSON.parse(ajaxify.variables.get('active')); - conditions = JSON.parse(ajaxify.variables.get('conditions')); - conditionals = JSON.parse(ajaxify.variables.get('conditionals')); - - $('[data-selected]').each(function() { - select($(this)); - }); + available = JSON.parse(ajaxify.variables.get('rewards')); + active = JSON.parse(ajaxify.variables.get('active')); + conditions = JSON.parse(ajaxify.variables.get('conditions')); + conditionals = JSON.parse(ajaxify.variables.get('conditionals')); + + $('[data-selected]').each(function() { + select($(this)); + }); - $('#active') - .on('change', '[data-selected]', function() { - update($(this)); - }) - .on('click', '.delete', function() { - var parent = $(this).parents('[data-id]'), - id = parent.attr('data-id'); - - socket.emit('admin.rewards.delete', {id: id}, function(err) { - if (err) { - app.alertError(err.message); - } else { - app.alertSuccess('Successfully deleted reward'); - } - }); - - parent.remove(); - return false; - }) - .on('click', '.toggle', function() { - var btn = $(this), - disabled = btn.html() === 'Enable', - id = $(this).parents('[data-id]').attr('data-id'); - - btn.toggleClass('btn-warning').toggleClass('btn-success').html(disabled ? 'Enable' : 'Disable'); - // send disable api call - return false; + $('#active') + .on('change', '[data-selected]', function() { + update($(this)); + }) + .on('click', '.delete', function() { + var parent = $(this).parents('[data-id]'), + id = parent.attr('data-id'); + + socket.emit('admin.rewards.delete', {id: id}, function(err) { + if (err) { + app.alertError(err.message); + } else { + app.alertSuccess('Successfully deleted reward'); + } }); - $('#new').on('click', newReward); - $('#save').on('click', saveRewards); + parent.remove(); + return false; + }) + .on('click', '.toggle', function() { + var btn = $(this), + disabled = btn.html() === 'Enable', + id = $(this).parents('[data-id]').attr('data-id'); + + btn.toggleClass('btn-warning').toggleClass('btn-success').html(disabled ? 'Enable' : 'Disable'); + // send disable api call + return false; + }); - populateInputs(); - }); + $('#new').on('click', newReward); + $('#save').on('click', saveRewards); + + populateInputs(); }; function select(el) {