Merge pull request +6175 from c9/sdk

Changing the name of dialog.filesave to dialog.file
pull/9/merge
Harutyun Amirjanyan 2015-02-13 21:43:51 +04:00
commit 433d06527a
8 zmienionych plików z 13 dodań i 13 usunięć

Wyświetl plik

@ -243,7 +243,7 @@ module.exports = function(options) {
packagePath: "plugins/c9.ide.dialog.login/login", packagePath: "plugins/c9.ide.dialog.login/login",
noLogout: !options.local noLogout: !options.local
}, },
"plugins/c9.ide.dialog.file/filesave", "plugins/c9.ide.dialog.file/file",
"plugins/c9.ide.dialog.wizard/wizard", "plugins/c9.ide.dialog.wizard/wizard",
// VFS // VFS

Wyświetl plik

@ -58,7 +58,7 @@
"c9.ide.language.javascript.tern": "#3d678a103a", "c9.ide.language.javascript.tern": "#3d678a103a",
"c9.ide.language.javascript.infer": "#1ae097af44", "c9.ide.language.javascript.infer": "#1ae097af44",
"c9.ide.language.jsonalyzer": "#45a20496be", "c9.ide.language.jsonalyzer": "#45a20496be",
"c9.ide.collab": "#9b7f85fc89", "c9.ide.collab": "#116fe74942",
"c9.ide.local": "#d5c324ee5b", "c9.ide.local": "#d5c324ee5b",
"c9.ide.find": "#be3bca94b7", "c9.ide.find": "#be3bca94b7",
"c9.ide.find.infiles": "#462928475c", "c9.ide.find.infiles": "#462928475c",
@ -92,14 +92,14 @@
"c9.ide.readonly": "#f6f07bbe42", "c9.ide.readonly": "#f6f07bbe42",
"c9.ide.recentfiles": "#7c099abf40", "c9.ide.recentfiles": "#7c099abf40",
"c9.ide.remote": "#37773d905b", "c9.ide.remote": "#37773d905b",
"c9.ide.run": "#63341edc5d", "c9.ide.run": "#0a8cc7f0a9",
"c9.ide.run.build": "#2ba0107f97", "c9.ide.run.build": "#6726030127",
"c9.ide.save": "#4cf2ae332c", "c9.ide.save": "#a32a8f4346",
"c9.ide.terminal.monitor": "#8e025b3ae1", "c9.ide.terminal.monitor": "#8e025b3ae1",
"c9.ide.theme.flat": "#5c7c27ab74", "c9.ide.theme.flat": "#5c7c27ab74",
"c9.ide.threewaymerge": "#229382aa0b", "c9.ide.threewaymerge": "#229382aa0b",
"c9.ide.undo": "#b028bcb4d5", "c9.ide.undo": "#b028bcb4d5",
"c9.ide.upload": "#8726fed462", "c9.ide.upload": "#0bd010d3dc",
"c9.ide.welcome": "#b4be5c22a5" "c9.ide.welcome": "#b4be5c22a5"
} }
} }

Wyświetl plik

@ -66,7 +66,7 @@ require(["lib/architect/architect", "lib/chai/chai", "/vfs-root"],
"commands", "menus", "commands", "layout", "watcher", "commands", "menus", "commands", "layout", "watcher",
"preferences", "anims", "clipboard", "dialog.alert", "auth.bootstrap", "preferences", "anims", "clipboard", "dialog.alert", "auth.bootstrap",
"dialog.question", "debugger", "run.gui", "info", "dialog.error", "dialog.question", "debugger", "run.gui", "info", "dialog.error",
"dialog.filesave" "dialog.file"
], ],
setup: expect.html.mocked setup: expect.html.mocked
}, },

Wyświetl plik

@ -2,7 +2,7 @@ define(function(require, module, exports) {
main.consumes = [ main.consumes = [
"Plugin", "ui", "fs", "dialog.alert", "fs.cache", "util", "Dialog", "tree" "Plugin", "ui", "fs", "dialog.alert", "fs.cache", "util", "Dialog", "tree"
]; ];
main.provides = ["dialog.filesave"]; main.provides = ["dialog.file"];
return main; return main;
function main(options, imports, register) { function main(options, imports, register) {
@ -45,10 +45,10 @@ define(function(require, module, exports) {
drawn = true; drawn = true;
// Markup // Markup
ui.insertMarkup(null, require("text!./filesave.xml"), plugin); ui.insertMarkup(null, require("text!./file.xml"), plugin);
// CSS // CSS
ui.insertCss(require("text!./filesave.css"), plugin); ui.insertCss(require("text!./file.css"), plugin);
dialog = plugin.getElement("window"); dialog = plugin.getElement("window");
container = plugin.getElement("container"); container = plugin.getElement("container");
@ -368,7 +368,7 @@ define(function(require, module, exports) {
}); });
register("", { register("", {
"dialog.filesave" : plugin "dialog.file" : plugin
}); });
} }
}); });

Wyświetl plik

@ -68,7 +68,7 @@ require(["lib/architect/architect", "lib/chai/chai", "/vfs-root"],
"plugins/c9.ide.dialog.common/fileoverwrite", "plugins/c9.ide.dialog.common/fileoverwrite",
"plugins/c9.ide.dialog.common/fileremove", "plugins/c9.ide.dialog.common/fileremove",
"plugins/c9.ide.dialog.common/question", "plugins/c9.ide.dialog.common/question",
"plugins/c9.ide.dialog.file/filesave", "plugins/c9.ide.dialog.file/file",
// Mock plugins // Mock plugins
{ {

Wyświetl plik

@ -388,7 +388,7 @@ require([
"dialog.alert": {show: function() { console.log(console, Array.prototype.slice.apply(arguments)); }}, "dialog.alert": {show: function() { console.log(console, Array.prototype.slice.apply(arguments)); }},
"dialog.confirm": {show: function() {}}, "dialog.confirm": {show: function() {}},
"dialog.question": {show: function() {}}, "dialog.question": {show: function() {}},
"dialog.filesave": {show: function() {}}, "dialog.file": {show: function() {}},
"dialog.fileremove": {show: function() {}}, "dialog.fileremove": {show: function() {}},
"dialog.fileoverwrite": {show: function() {}}, "dialog.fileoverwrite": {show: function() {}},
"dialog.error": { "dialog.error": {