linting and moving xregexp back to .js

v1.18.x
Julian Lam 11 years ago
parent 738ada9b16
commit ca2e9d7d9e

@ -1,3 +1,5 @@
"use strict";
/* global socket, define, templates, bootbox, app, ajaxify, */
define(function() { define(function() {
var Users = {}; var Users = {};
@ -192,7 +194,7 @@ define(function() {
templates.preload_template('admin/users', function() { templates.preload_template('admin/users', function() {
templates['admin/users'].parse({users:[]}); 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 users: data.users
}), }),
userListEl = document.querySelector('.users'); userListEl = document.querySelector('.users');
@ -225,7 +227,7 @@ define(function() {
function onUsersLoaded(users) { function onUsersLoaded(users) {
templates.preload_template('admin/users', function() { templates.preload_template('admin/users', function() {
templates['admin/users'].parse({users:[]}); 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 users: users
}); });
html = $(html); html = $(html);

@ -238,7 +238,7 @@ var fs = require('fs'),
'vendor/requirejs/require.js', 'vendor/requirejs/require.js',
'vendor/bootbox/bootbox.min.js', 'vendor/bootbox/bootbox.min.js',
'vendor/tinycon/tinycon.js', 'vendor/tinycon/tinycon.js',
'vendor/xregexp/xregexp.min.js', 'vendor/xregexp/xregexp.js',
'vendor/xregexp/unicode/unicode-base.js', 'vendor/xregexp/unicode/unicode-base.js',
'src/app.js', 'src/app.js',
'src/templates.js', 'src/templates.js',

Loading…
Cancel
Save