Merge remote-tracking branch 'origin/master' into preview-perf

pull/9/merge
Fabian Jakobs 2015-02-13 10:16:02 +00:00
commit 8e21410269
2 zmienionych plików z 10 dodań i 5 usunięć

Wyświetl plik

@ -236,6 +236,7 @@ define(function(require, exports, module) {
offset = 0; offset = 0;
error = null; error = null;
hideTimeout = null; hideTimeout = null;
disconnect = null;
}); });
/***** Register and define API *****/ /***** Register and define API *****/

Wyświetl plik

@ -48,11 +48,6 @@ define(function(require, module, exports) {
/***** Register *****/ /***** Register *****/
plugin.freezePublicAPI({ plugin.freezePublicAPI({
show: show
})
register("", {
"dialog.filechange": plugin,
/** /**
* *
*/ */
@ -61,6 +56,15 @@ define(function(require, module, exports) {
{ id: "applyall", visible: value} { id: "applyall", visible: value}
]); ]);
}, },
/**
*
*/
show: show
});
register("", {
"dialog.filechange": plugin,
}); });
} }
}); });