kopia lustrzana https://github.com/c9/core
Merge pull request +9156 from c9/salesforce-update
[Trivial] More minor Salesforce tweakspull/134/merge
commit
9053dd0a47
|
@ -65,8 +65,8 @@
|
|||
"c9.ide.language.javascript.eslint": "#df7e424b54",
|
||||
"c9.ide.language.javascript.tern": "#ad1d9b1b3a",
|
||||
"c9.ide.language.javascript.infer": "#8478e3c702",
|
||||
"c9.ide.language.jsonalyzer": "#875571f514",
|
||||
"c9.ide.collab": "#3156c58f37",
|
||||
"c9.ide.language.jsonalyzer": "#83646961c7",
|
||||
"c9.ide.collab": "#56c59702c7",
|
||||
"c9.ide.local": "#a9703b630c",
|
||||
"c9.ide.find": "#35379124ca",
|
||||
"c9.ide.find.infiles": "#c132ad243c",
|
||||
|
@ -92,7 +92,7 @@
|
|||
"c9.ide.installer": "#0fde9f0067",
|
||||
"c9.ide.mount": "#292b312b4b",
|
||||
"c9.ide.navigate": "#c191d9b92f",
|
||||
"c9.ide.newresource": "#f1f0624768",
|
||||
"c9.ide.newresource": "#981a408a7b",
|
||||
"c9.ide.openfiles": "#7fa4a97fed",
|
||||
"c9.ide.preview": "#c530a7978d",
|
||||
"c9.ide.preview.browser": "#c50007ebbc",
|
||||
|
@ -105,7 +105,7 @@
|
|||
"c9.ide.run": "#c53178c339",
|
||||
"c9.ide.run.build": "#0598fff697",
|
||||
"c9.ide.run.debug.xdebug": "#61dcbd0180",
|
||||
"c9.ide.save": "#326087f5a2",
|
||||
"c9.ide.save": "#572967ef59",
|
||||
"c9.ide.scm": "#f3847917b8",
|
||||
"c9.ide.terminal.monitor": "#b52a3f2144",
|
||||
"c9.ide.theme.flat": "#2de8414db7",
|
||||
|
|
|
@ -37,7 +37,7 @@ define(function(require, module, exports) {
|
|||
else {
|
||||
plugin.title = title;
|
||||
}
|
||||
plugin.heading = util.escapeXml(header);
|
||||
plugin.heading = options && options.isHTML ? header : util.escapeXml(header);
|
||||
plugin.body = options && options.isHTML ? msg : (util.escapeXml(msg) || "")
|
||||
.replace(/\n/g, "<br />")
|
||||
.replace(/(https?:\/\/[^\s]*\b)/g, "<a href='$1' target='_blank'>$1</a>");
|
||||
|
|
|
@ -21,11 +21,11 @@ define(function(require, module, exports) {
|
|||
|
||||
/***** Methods *****/
|
||||
|
||||
function show(title, header, msg, onconfirm, oncancel) {
|
||||
function show(title, header, msg, onconfirm, oncancel, options) {
|
||||
return plugin.queue(function(){
|
||||
plugin.title = title;
|
||||
plugin.heading = util.escapeXml(header);
|
||||
plugin.body = util.escapeXml(msg);
|
||||
plugin.heading = options && options.isHTML ? header : util.escapeXml(header);
|
||||
plugin.body = options && options.isHTML ? msg : util.escapeXml(msg).replace(/\n/g, "<br>");
|
||||
|
||||
plugin.update([
|
||||
{ id: "ok", onclick: function(){ plugin.hide(); onconfirm(); } },
|
||||
|
|
Ładowanie…
Reference in New Issue