kopia lustrzana https://github.com/c9/core
fix tests
rodzic
822eccb18f
commit
09de6cbb60
|
@ -1,7 +1,7 @@
|
||||||
define(function(require, exports, module) {
|
define(function(require, exports, module) {
|
||||||
main.consumes = [
|
main.consumes = [
|
||||||
"Plugin", "fs", "settings", "preferences", "watcher", "tabManager",
|
"Plugin", "fs", "settings", "preferences", "watcher", "tabManager",
|
||||||
"save", "dialog.question", "dialog.filechange", "threewaymerge", "error_handler"
|
"save", "dialog.question", "dialog.filechange", "threewaymerge"
|
||||||
];
|
];
|
||||||
main.provides = ["watcher.gui"];
|
main.provides = ["watcher.gui"];
|
||||||
return main;
|
return main;
|
||||||
|
@ -17,7 +17,6 @@ define(function(require, exports, module) {
|
||||||
var question = imports["dialog.question"];
|
var question = imports["dialog.question"];
|
||||||
var filechange = imports["dialog.filechange"];
|
var filechange = imports["dialog.filechange"];
|
||||||
var threeWayMerge = imports.threewaymerge.merge;
|
var threeWayMerge = imports.threewaymerge.merge;
|
||||||
var errorHandler = imports.error_handler;
|
|
||||||
|
|
||||||
var collabEnabled = options.collab;
|
var collabEnabled = options.collab;
|
||||||
|
|
||||||
|
@ -126,7 +125,7 @@ define(function(require, exports, module) {
|
||||||
if (tab) {
|
if (tab) {
|
||||||
// If collab picks this up and handles the change it will return false
|
// If collab picks this up and handles the change it will return false
|
||||||
if (emit("docChange", {tab: tab}) === false)
|
if (emit("docChange", {tab: tab}) === false)
|
||||||
return
|
return;
|
||||||
|
|
||||||
addChangedTab(tab, e.type === "change");
|
addChangedTab(tab, e.type === "change");
|
||||||
}
|
}
|
||||||
|
|
|
@ -106,6 +106,10 @@ require([
|
||||||
x.check = function(){};
|
x.check = function(){};
|
||||||
return x;
|
return x;
|
||||||
})(),
|
})(),
|
||||||
|
"watcher.gui": (function(){
|
||||||
|
var x = new EventEmitter();
|
||||||
|
return x;
|
||||||
|
})(),
|
||||||
save: (function(){
|
save: (function(){
|
||||||
var x = new EventEmitter();
|
var x = new EventEmitter();
|
||||||
x.saveAll = function(c){ c(); };
|
x.saveAll = function(c){ c(); };
|
||||||
|
|
Ładowanie…
Reference in New Issue