From ffcb324d911dbb53cd02535966a6c96edb423846 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Fri, 10 Oct 2014 03:17:50 -0400 Subject: [PATCH] oh bootbox, I forgive you. (I lost hope in this actually being resolved upstream) --- public/src/admin/manage/flags.js | 2 +- public/src/admin/manage/tags.js | 2 +- public/src/admin/modules/iconSelect.js | 2 +- public/src/app.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/src/admin/manage/flags.js b/public/src/admin/manage/flags.js index 405b45441c..824de26971 100644 --- a/public/src/admin/manage/flags.js +++ b/public/src/admin/manage/flags.js @@ -1,5 +1,5 @@ "use strict"; -/*global define, socket, app, admin, utils, bootbox, RELATIVE_PATH*/ +/*global define, socket, app, admin, utils, RELATIVE_PATH*/ define('admin/manage/flags', ['infinitescroll', 'admin/selectable'], function(infinitescroll, selectable) { var Flags = {}; diff --git a/public/src/admin/manage/tags.js b/public/src/admin/manage/tags.js index 609306a7f7..b87580099d 100644 --- a/public/src/admin/manage/tags.js +++ b/public/src/admin/manage/tags.js @@ -69,7 +69,7 @@ define('admin/manage/tags', ['infinitescroll', 'admin/selectable'], function(inf setTimeout(function() { handleColorPickers(); - }, 500); // bootbox made me do it. + }, 500); }); }; diff --git a/public/src/admin/modules/iconSelect.js b/public/src/admin/modules/iconSelect.js index 97cfe429b8..286009bf0f 100644 --- a/public/src/admin/modules/iconSelect.js +++ b/public/src/admin/modules/iconSelect.js @@ -33,7 +33,7 @@ define(function() { } }); - setTimeout(function() { //bootbox was rewritten for BS3 and I had to add this timeout for the previous code to work. TODO: to look into + setTimeout(function() { $('.bootbox .fa-icons i').on('click', function() { $('.bootbox .selected').removeClass('selected'); $(this).addClass('selected'); diff --git a/public/src/app.js b/public/src/app.js index 0e6a41fb3d..815f4752cb 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -1,5 +1,5 @@ "use strict"; -/*global io, templates, translator, ajaxify, utils, RELATIVE_PATH*/ +/*global io, templates, translator, ajaxify, utils, bootbox, RELATIVE_PATH*/ var socket, config,