Skip to content

Commit 4fde785

Browse files
committed
Refactor some moduels and fix some bugs
1 parent 25e880f commit 4fde785

File tree

11 files changed

+23
-14
lines changed

11 files changed

+23
-14
lines changed

addons/aceeditor/addon-built.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

addons/aceeditor/client.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ define([
77
var $ = codebox.require("jQuery");
88
var commands = codebox.require("core/commands");
99
var tabs = codebox.require("utils/tabs");
10-
var settings = codebox.require("utils/settings");
10+
var settings = codebox.require("core/settings");
1111
var files = codebox.require("core/files");
1212
var config = codebox.require("config");
1313

addons/manager/addon-built.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

addons/manager/client.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ define(["views/dialog"], function(InstallerDialog) {
22
var commands = codebox.require("core/commands");
33
var app = codebox.require("core/app");
44
var dialogs = codebox.require("utils/dialogs");
5-
var settings = codebox.require("utils/settings");
5+
var settings = codebox.require("core/settings");
66

77
// Add settings
88
settings.add({

addons/settings/addon-built.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

addons/settings/views/dialog.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ define([
33
], function() {
44
var _ = codebox.require("underscore");
55
var DialogView = codebox.require("views/dialogs/base");
6-
var settings = codebox.require("utils/settings");
6+
var settings = codebox.require("core/settings");
77

88
var SettingsDialog = DialogView.extend({
99
className: "addon-settings-dialog modal fade",

client/core/app.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ define([
55
'core/box',
66
'core/session',
77
'core/addons',
8-
'core/box'
9-
], function (hr, url, dialogs, box, session, addons, box) {
8+
'core/box',
9+
'core/files'
10+
], function (hr, url, dialogs, box, session, addons, box, files) {
1011

1112
// Define base application
1213
var Application = hr.Application.extend({
@@ -63,6 +64,9 @@ define([
6364
addons.on("add", function(addon) {
6465
addon.load();
6566
});
67+
68+
// Open root files
69+
files.open(box.root);
6670
});
6771
}
6872
return Application.__super__.finish.apply(this, arguments);

client/core/files.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ define([
33
'underscore',
44
'hr/hr',
55
'models/file',
6+
'core/user',
67
'core/box',
7-
'utils/settings',
8+
'core/settings',
89
'utils/dialogs',
910
'utils/tabs',
1011
'views/tabs/file',
1112
'views/files/base'
12-
], function(Q, _, hr, File, box, settings, dialogs, tabs, FileTab) {
13+
], function(Q, _, hr, File, user, box, settings, dialogs, tabs, FileTab) {
1314
var logging = hr.Logger.addNamespace("files");
1415

1516
// Settings for files manager
@@ -18,6 +19,7 @@ define([
1819
'title': "Files",
1920
'fields': {}
2021
});
22+
var userSettings = user.settings("files");
2123

2224
// Files handlers map
2325
var handlers = {};
@@ -40,7 +42,7 @@ define([
4042
var tab = manager.getActiveTabByType("directory");
4143
if (tab != null && !manager.checkTabExists(path)) {
4244
// Change current tab to open the file
43-
tab.view.load(path);
45+
tab.view.load(path, handler);
4446
} else {
4547
// Add new tab
4648
tabs.open(FileTab, {
@@ -68,7 +70,7 @@ define([
6870
// Get handler for a file
6971
var getHandlers = function(file, defaultHandler) {
7072
return _.filter(handlers, function(handler) {
71-
return handler.valid(file);
73+
return userSettings.get(handler.id, true) && handler.valid(file);
7274
});
7375
};
7476

client/core/search.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ define([
33
'jQuery',
44
'underscore',
55
'core/user',
6-
'utils/settings'
6+
'core/settings'
77
],function(hr, $, _, user, settings) {
88
var logging = hr.Logger.addNamespace("search");
99

0 commit comments

Comments
 (0)