kopia lustrzana https://github.com/c9/core
Merge pull request +15706 from c9/ide-fix-various
fix small ide issuespull/460/head
commit
31b2dcf911
|
@ -346,7 +346,9 @@ define(function(require, exports, module) {
|
||||||
path: "user/language/@hints",
|
path: "user/language/@hints",
|
||||||
position: 1000
|
position: 1000
|
||||||
},
|
},
|
||||||
"Ignore Messages Matching <a href=\"http://en.wikipedia.org/wiki/Regular_expression\" target=\"blank\">Regex</a>": {
|
"Ignore Messages Matching Regex": {
|
||||||
|
title: [null, "Ignore Messages Matching ", ["a", {
|
||||||
|
href: "http://en.wikipedia.org/wiki/Regular_expression", target: "blank"}, "Regex"]],
|
||||||
type: "textbox",
|
type: "textbox",
|
||||||
path: "user/language/@ignoredMarkers",
|
path: "user/language/@ignoredMarkers",
|
||||||
position: 3000
|
position: 3000
|
||||||
|
|
|
@ -372,7 +372,7 @@ define(function(require, exports, module) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else if (options.url && /\.json$/.test(root)) {
|
else if (options.url && /\.json$/.test(root)) {
|
||||||
require(["text!" + options.id + "/" + root], function(value) {
|
require(["text!" + options.url + "/" + root], function(value) {
|
||||||
try {
|
try {
|
||||||
var json = JSON.parse(value);
|
var json = JSON.parse(value);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|
|
@ -29,7 +29,7 @@ define(function(require, exports, module) {
|
||||||
index: 10,
|
index: 10,
|
||||||
divider: true,
|
divider: true,
|
||||||
selector: function(path) {
|
selector: function(path) {
|
||||||
return /\.(?:html|htm|xhtml|pdf|svg)$|^https?\:\/\//.test(path);
|
return /\.(?:html|htm|xhtml|pdf|svg|mov|mp[34g]|ogg|webm|wma)$|^https?\:\/\//.test(path);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,7 @@ define(function(require, exports, module) {
|
||||||
|
|
||||||
var basename = require("path").basename;
|
var basename = require("path").basename;
|
||||||
|
|
||||||
var extensions = ["pdf", "swf"];
|
var extensions = ["pdf", "swf", "mov", "mp3", "mp4", "mpg", "ogg", "webm", "wma"];
|
||||||
|
|
||||||
var previewUrl = options.previewUrl.replace(/^[/]/, function() {
|
var previewUrl = options.previewUrl.replace(/^[/]/, function() {
|
||||||
return c9.location.replace(/^(\w+:[/]+[^/#?]+).*/, "$1/");
|
return c9.location.replace(/^(\w+:[/]+[^/#?]+).*/, "$1/");
|
||||||
|
|
Ładowanie…
Reference in New Issue