Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-06 05:55:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed ACP from previous commit

Browse Source
This commit is contained in:
psychobunny
2014-10-08 16:08:35 -04:00
parent 0f759f9df4
commit ed60deb3f5
22 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/admin/appearance/customise.js
View File

@@ -1,7 +1,7 @@
"use strict"; "use strict";
/* global define, app, socket */ /* global define, app, socket */
define('forum/admin/appearance/customise', ['forum/admin/settings'], function(Settings) { define('admin/appearance/customise', ['admin/settings'], function(Settings) {
var Customise = {}; var Customise = {};
Customise.init = function() { Customise.init = function() {

2
public/src/admin/appearance/skins.js
View File

@@ -1,7 +1,7 @@
"use strict"; "use strict";
/* global define, app, socket */ /* global define, app, socket */
define('forum/admin/appearance/skins', function() { define('admin/appearance/skins', function() {
var Skins = {}; var Skins = {};
Skins.init = function() { Skins.init = function() {

2
public/src/admin/appearance/themes.js
View File

@@ -1,7 +1,7 @@
"use strict"; "use strict";
/* global define, app, socket */ /* global define, app, socket */
define('forum/admin/appearance/themes', function() { define('admin/appearance/themes', function() {
var Themes = {}; var Themes = {};
Themes.init = function() { Themes.init = function() {

2
public/src/admin/extend/plugins.js
View File

@@ -1,7 +1,7 @@
"use strict"; "use strict";
/* global define, app, socket */ /* global define, app, socket */
define('forum/admin/extend/plugins', function() { define('admin/extend/plugins', function() {
var Plugins = { var Plugins = {
init: function() { init: function() {
var pluginsList = $('.plugins'), var pluginsList = $('.plugins'),

2
public/src/admin/extend/widgets.js
View File

@@ -1,7 +1,7 @@
"use strict"; "use strict";
/* global define, app, socket */ /* global define, app, socket */
define('forum/admin/extend/widgets', function() { define('admin/extend/widgets', function() {
var Widgets = {}; var Widgets = {};
Widgets.init = function() { Widgets.init = function() {

2
public/src/admin/footer.js
View File

@@ -1,7 +1,7 @@
"use strict"; "use strict";
/*global define, app, socket, Hammer, RELATIVE_PATH */ /*global define, app, socket, Hammer, RELATIVE_PATH */
define('forum/admin/footer', ['forum/admin/settings'], function(Settings) { define('admin/footer', ['admin/settings'], function(Settings) {
var acpIndex; var acpIndex;
$(document).ready(function() { $(document).ready(function() {

2
public/src/admin/general/dashboard.js
View File

@@ -1,7 +1,7 @@
"use strict"; "use strict";
/*global define, ajaxify, app, socket, RELATIVE_PATH*/ /*global define, ajaxify, app, socket, RELATIVE_PATH*/
define('forum/admin/general/dashboard', ['semver'], function(semver) { define('admin/general/dashboard', ['semver'], function(semver) {
var Admin = {}, var Admin = {},
intervals = { intervals = {
rooms: false, rooms: false,

2
public/src/admin/general/languages.js
View File

@@ -1,7 +1,7 @@
"use strict"; "use strict";
/*global define*/ /*global define*/
define('forum/admin/general/languages', ['forum/admin/settings'], function(Settings) { define('admin/general/languages', ['admin/settings'], function(Settings) {
$(function() { $(function() {
Settings.prepare(); Settings.prepare();
}); });

2
public/src/admin/general/sounds.js
View File

@@ -1,7 +1,7 @@
"use strict"; "use strict";
/* global define, socket */ /* global define, socket */
define('forum/admin/general/sounds', ['sounds', 'settings'], function(Sounds, Settings) { define('admin/general/sounds', ['sounds', 'settings'], function(Sounds, Settings) {
var SoundsAdmin = {}; var SoundsAdmin = {};
SoundsAdmin.init = function() { SoundsAdmin.init = function() {

2
public/src/admin/manage/categories.js
View File

@@ -1,7 +1,7 @@
"use strict"; "use strict";
/*global define, socket, app, bootbox, templates, ajaxify, RELATIVE_PATH*/ /*global define, socket, app, bootbox, templates, ajaxify, RELATIVE_PATH*/
define('forum/admin/manage/categories', ['uploader', 'forum/admin/iconSelect'], function(uploader, iconSelect) { define('admin/manage/categories', ['uploader', 'admin/iconSelect'], function(uploader, iconSelect) {
var Categories = {}; var Categories = {};
Categories.init = function() { Categories.init = function() {

2
public/src/admin/manage/flags.js
View File

@@ -1,7 +1,7 @@
"use strict"; "use strict";
/*global define, socket, app, admin, utils, bootbox, RELATIVE_PATH*/ /*global define, socket, app, admin, utils, bootbox, RELATIVE_PATH*/
define('forum/admin/manage/flags', ['forum/infinitescroll', 'admin/selectable'], function(infinitescroll, selectable) { define('admin/manage/flags', ['infinitescroll', 'admin/selectable'], function(infinitescroll, selectable) {
var Flags = {}; var Flags = {};
Flags.init = function() { Flags.init = function() {

2
public/src/admin/manage/groups.js
View File

@@ -1,7 +1,7 @@
"use strict"; "use strict";
/*global define, templates, socket, ajaxify, app, bootbox*/ /*global define, templates, socket, ajaxify, app, bootbox*/
define('forum/admin/manage/groups', ['forum/admin/iconSelect'], function(iconSelect) { define('admin/manage/groups', ['admin/iconSelect'], function(iconSelect) {
var Groups = {}; var Groups = {};
Groups.init = function() { Groups.init = function() {

2
public/src/admin/manage/tags.js
View File

@@ -1,7 +1,7 @@
"use strict"; "use strict";
/*global define, socket, app, admin, utils, bootbox, RELATIVE_PATH*/ /*global define, socket, app, admin, utils, bootbox, RELATIVE_PATH*/
define('forum/admin/manage/tags', ['forum/infinitescroll', 'admin/selectable'], function(infinitescroll, selectable) { define('admin/manage/tags', ['infinitescroll', 'admin/selectable'], function(infinitescroll, selectable) {
var Tags = {}, var Tags = {},
timeoutId = 0; timeoutId = 0;

2
public/src/admin/manage/users.js
View File

@@ -1,6 +1,6 @@
"use strict"; "use strict";
/* global socket, define, templates, bootbox, app, ajaxify, */ /* global socket, define, templates, bootbox, app, ajaxify, */
define('forum/admin/manage/users', ['admin/selectable'], function(selectable) { define('admin/manage/users', ['admin/selectable'], function(selectable) {
var Users = {}; var Users = {};
Users.init = function() { Users.init = function() {

2
public/src/admin/settings.js
View File

@@ -1,7 +1,7 @@
"use strict"; "use strict";
/*global define, app, socket, ajaxify, RELATIVE_PATH */ /*global define, app, socket, ajaxify, RELATIVE_PATH */
define('forum/admin/settings', ['uploader', 'sounds'], function(uploader, sounds) { define('admin/settings', ['uploader', 'sounds'], function(uploader, sounds) {
var Settings = {}; var Settings = {};
Settings.init = function() { Settings.init = function() {

4
public/src/ajaxify.js
View File

@@ -145,7 +145,9 @@ $(document).ready(function() {
}; };
ajaxify.loadScript = function(tpl_url, callback) { ajaxify.loadScript = function(tpl_url, callback) {
require(['forum/' + tpl_url], function(script) { var location = !app.inAdmin ? 'forum/' : '';
require([location + tpl_url], function(script) {
if (script && script.init) { if (script && script.init) {
script.init(); script.init();
} }

2
src/views/admin/advanced/events.tpl
View File

@@ -28,4 +28,4 @@ require(['forum/infinitescroll'], function(infinitescroll) {
}); });
}); });
</script </script>

2
src/views/admin/appearance/skins.tpl
View File

@@ -25,7 +25,7 @@
<script> <script>
var bootswatchListener = function(data) { var bootswatchListener = function(data) {
require(['forum/admin/appearance/skins'], function(t) { require(['admin/appearance/skins'], function(t) {
t.render(data); t.render(data);
}); });
}; };

2
src/views/admin/development/logger.tpl
View File

@@ -45,7 +45,7 @@
<script> <script>
require(['forum/admin/settings'], function(Settings) { require(['admin/settings'], function(Settings) {
Settings.prepare(); Settings.prepare();
}); });
</script> </script>

2
src/views/admin/footer.tpl
View File

@@ -48,7 +48,7 @@
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
require(['forum/admin/footer']); require(['admin/footer']);
</script> </script>
</body> </body>

4
src/views/admin/header.tpl
View File

@@ -37,11 +37,13 @@
waitSeconds: 3, waitSeconds: 3,
urlArgs: "{cache-buster}", urlArgs: "{cache-buster}",
paths: { paths: {
'forum': '../forum', 'admin': '../admin',
'vendor': '../../vendor', 'vendor': '../../vendor',
'buzz': '../../vendor/buzz/buzz.min' 'buzz': '../../vendor/buzz/buzz.min'
} }
}); });
app.inAdmin = true;
</script> </script>
<!-- BEGIN scripts --> <!-- BEGIN scripts -->

2
src/views/admin/settings/footer.tpl
View File

@@ -12,7 +12,7 @@
</div> </div>
<script> <script>
require(['forum/admin/settings'], function(Settings) { require(['admin/settings'], function(Settings) {
Settings.prepare(); Settings.prepare();
}); });
</script> </script>