From ca2e9d7d9e658c4940dfcd51f1e863676305e739 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 12 Mar 2014 15:51:24 -0400 Subject: [PATCH] linting and moving xregexp back to .js --- public/src/forum/admin/users.js | 6 ++++-- public/vendor/xregexp/{xregexp.min.js => xregexp.js} | 0 src/meta.js | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename public/vendor/xregexp/{xregexp.min.js => xregexp.js} (100%) diff --git a/public/src/forum/admin/users.js b/public/src/forum/admin/users.js index 1ffabcb4c4..d3ade3d363 100644 --- a/public/src/forum/admin/users.js +++ b/public/src/forum/admin/users.js @@ -1,3 +1,5 @@ +"use strict"; +/* global socket, define, templates, bootbox, app, ajaxify, */ define(function() { var Users = {}; @@ -192,7 +194,7 @@ define(function() { templates.preload_template('admin/users', function() { templates['admin/users'].parse({users:[]}); - var html = templates.prepare(templates['admin/users'].blocks['users']).parse({ + var html = templates.prepare(templates['admin/users'].blocks.users).parse({ users: data.users }), userListEl = document.querySelector('.users'); @@ -225,7 +227,7 @@ define(function() { function onUsersLoaded(users) { templates.preload_template('admin/users', function() { templates['admin/users'].parse({users:[]}); - var html = templates.prepare(templates['admin/users'].blocks['users']).parse({ + var html = templates.prepare(templates['admin/users'].blocks.users).parse({ users: users }); html = $(html); diff --git a/public/vendor/xregexp/xregexp.min.js b/public/vendor/xregexp/xregexp.js similarity index 100% rename from public/vendor/xregexp/xregexp.min.js rename to public/vendor/xregexp/xregexp.js diff --git a/src/meta.js b/src/meta.js index de96477669..c08b4a1766 100644 --- a/src/meta.js +++ b/src/meta.js @@ -238,7 +238,7 @@ var fs = require('fs'), 'vendor/requirejs/require.js', 'vendor/bootbox/bootbox.min.js', 'vendor/tinycon/tinycon.js', - 'vendor/xregexp/xregexp.min.js', + 'vendor/xregexp/xregexp.js', 'vendor/xregexp/unicode/unicode-base.js', 'src/app.js', 'src/templates.js',