pull/117/merge
nightwing 2015-07-14 14:59:51 +04:00 zatwierdzone przez nightwing
rodzic 822eccb18f
commit 09de6cbb60
2 zmienionych plików z 6 dodań i 3 usunięć

Wyświetl plik

@ -1,7 +1,7 @@
define(function(require, exports, module) {
main.consumes = [
"Plugin", "fs", "settings", "preferences", "watcher", "tabManager",
"save", "dialog.question", "dialog.filechange", "threewaymerge", "error_handler"
"save", "dialog.question", "dialog.filechange", "threewaymerge"
];
main.provides = ["watcher.gui"];
return main;
@ -17,7 +17,6 @@ define(function(require, exports, module) {
var question = imports["dialog.question"];
var filechange = imports["dialog.filechange"];
var threeWayMerge = imports.threewaymerge.merge;
var errorHandler = imports.error_handler;
var collabEnabled = options.collab;
@ -126,7 +125,7 @@ define(function(require, exports, module) {
if (tab) {
// If collab picks this up and handles the change it will return false
if (emit("docChange", {tab: tab}) === false)
return
return;
addChangedTab(tab, e.type === "change");
}

Wyświetl plik

@ -106,6 +106,10 @@ require([
x.check = function(){};
return x;
})(),
"watcher.gui": (function(){
var x = new EventEmitter();
return x;
})(),
save: (function(){
var x = new EventEmitter();
x.saveAll = function(c){ c(); };