Fixes issue with images not displaying due to window.origin not being defined in IE10
Этот коммит содержится в:
@@ -24,7 +24,7 @@ module.exports = React.createClass({
|
|||||||
if (filename.indexOf("/api/v1/files/get") != -1) {
|
if (filename.indexOf("/api/v1/files/get") != -1) {
|
||||||
filename = filename.split("/api/v1/files/get")[1];
|
filename = filename.split("/api/v1/files/get")[1];
|
||||||
}
|
}
|
||||||
filename = window.location.origin + "/api/v1/files/get" + filename;
|
filename = utils.getWindowLocationOrigin() + "/api/v1/files/get" + filename;
|
||||||
|
|
||||||
if (type === "image") {
|
if (type === "image") {
|
||||||
previews.push(
|
previews.push(
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ module.exports = React.createClass({
|
|||||||
if (fileInfo.path.indexOf("/api/v1/files/get") != -1) {
|
if (fileInfo.path.indexOf("/api/v1/files/get") != -1) {
|
||||||
fileInfo.path = fileInfo.path.split("/api/v1/files/get")[1];
|
fileInfo.path = fileInfo.path.split("/api/v1/files/get")[1];
|
||||||
}
|
}
|
||||||
fileInfo.path = window.location.origin + "/api/v1/files/get" + fileInfo.path;
|
fileInfo.path = utils.getWindowLocationOrigin() + "/api/v1/files/get" + fileInfo.path;
|
||||||
|
|
||||||
if (type === "image") {
|
if (type === "image") {
|
||||||
$('<img/>').attr('src', fileInfo.path+'_thumb.jpg').load(function(path, name){ return function() {
|
$('<img/>').attr('src', fileInfo.path+'_thumb.jpg').load(function(path, name){ return function() {
|
||||||
@@ -112,7 +112,7 @@ module.exports = React.createClass({
|
|||||||
if (fileInfo.path.indexOf("/api/v1/files/get") != -1) {
|
if (fileInfo.path.indexOf("/api/v1/files/get") != -1) {
|
||||||
fileInfo.path = fileInfo.path.split("/api/v1/files/get")[1];
|
fileInfo.path = fileInfo.path.split("/api/v1/files/get")[1];
|
||||||
}
|
}
|
||||||
fileInfo.path = window.location.origin + "/api/v1/files/get" + fileInfo.path;
|
fileInfo.path = utils.getWindowLocationOrigin() + "/api/v1/files/get" + fileInfo.path;
|
||||||
|
|
||||||
if (type === "image") {
|
if (type === "image") {
|
||||||
if (i < Constants.MAX_DISPLAY_FILES) {
|
if (i < Constants.MAX_DISPLAY_FILES) {
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ RootPost = React.createClass({
|
|||||||
if (fileInfo.path.indexOf("/api/v1/files/get") != -1) {
|
if (fileInfo.path.indexOf("/api/v1/files/get") != -1) {
|
||||||
fileInfo.path = fileInfo.path.split("/api/v1/files/get")[1];
|
fileInfo.path = fileInfo.path.split("/api/v1/files/get")[1];
|
||||||
}
|
}
|
||||||
fileInfo.path = window.location.origin + "/api/v1/files/get" + fileInfo.path;
|
fileInfo.path = utils.getWindowLocationOrigin() + "/api/v1/files/get" + fileInfo.path;
|
||||||
|
|
||||||
if (ftype === "image") {
|
if (ftype === "image") {
|
||||||
var url = fileInfo.path.replace(re1, '%20').replace(re2, '%28').replace(re3, '%29');
|
var url = fileInfo.path.replace(re1, '%20').replace(re2, '%28').replace(re3, '%29');
|
||||||
@@ -208,7 +208,7 @@ CommentPost = React.createClass({
|
|||||||
if (fileInfo.path.indexOf("/api/v1/files/get") != -1) {
|
if (fileInfo.path.indexOf("/api/v1/files/get") != -1) {
|
||||||
fileInfo.path = fileInfo.path.split("/api/v1/files/get")[1];
|
fileInfo.path = fileInfo.path.split("/api/v1/files/get")[1];
|
||||||
}
|
}
|
||||||
fileInfo.path = window.location.origin + "/api/v1/files/get" + fileInfo.path;
|
fileInfo.path = utils.getWindowLocationOrigin() + "/api/v1/files/get" + fileInfo.path;
|
||||||
|
|
||||||
if (type === "image") {
|
if (type === "image") {
|
||||||
var url = fileInfo.path.replace(re1, '%20').replace(re2, '%28').replace(re3, '%29');
|
var url = fileInfo.path.replace(re1, '%20').replace(re2, '%28').replace(re3, '%29');
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ module.exports = React.createClass({
|
|||||||
if (fileInfo.path.indexOf("/api/v1/files/get") !== -1) {
|
if (fileInfo.path.indexOf("/api/v1/files/get") !== -1) {
|
||||||
fileInfo.path = fileInfo.path.split("/api/v1/files/get")[1];
|
fileInfo.path = fileInfo.path.split("/api/v1/files/get")[1];
|
||||||
}
|
}
|
||||||
fileInfo.path = window.location.origin + "/api/v1/files/get" + fileInfo.path;
|
fileInfo.path = utils.getWindowLocationOrigin() + "/api/v1/files/get" + fileInfo.path;
|
||||||
src = fileInfo['path'] + '_preview.jpg';
|
src = fileInfo['path'] + '_preview.jpg';
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -148,7 +148,7 @@ module.exports = React.createClass({
|
|||||||
if (info.path.indexOf("/api/v1/files/get") !== -1) {
|
if (info.path.indexOf("/api/v1/files/get") !== -1) {
|
||||||
info.path = info.path.split("/api/v1/files/get")[1];
|
info.path = info.path.split("/api/v1/files/get")[1];
|
||||||
}
|
}
|
||||||
info.path = window.location.origin + "/api/v1/files/get" + info.path;
|
info.path = utils.getWindowLocationOrigin() + "/api/v1/files/get" + info.path;
|
||||||
preview_filename = info['path'] + '_preview.jpg';
|
preview_filename = info['path'] + '_preview.jpg';
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -166,7 +166,7 @@ module.exports = React.createClass({
|
|||||||
if (download_link.indexOf("/api/v1/files/get") !== -1) {
|
if (download_link.indexOf("/api/v1/files/get") !== -1) {
|
||||||
download_link = download_link.split("/api/v1/files/get")[1];
|
download_link = download_link.split("/api/v1/files/get")[1];
|
||||||
}
|
}
|
||||||
download_link = window.location.origin + "/api/v1/files/get" + download_link;
|
download_link = utils.getWindowLocationOrigin() + "/api/v1/files/get" + download_link;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="modal fade image_modal" ref="modal" id={this.props.modalId} tabIndex="-1" role="dialog" aria-hidden="true">
|
<div className="modal fade image_modal" ref="modal" id={this.props.modalId} tabIndex="-1" role="dialog" aria-hidden="true">
|
||||||
|
|||||||
@@ -22,8 +22,6 @@ module.exports.cleanUpUrlable = function(input) {
|
|||||||
return cleaned;
|
return cleaned;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
module.exports.isTestDomain = function() {
|
module.exports.isTestDomain = function() {
|
||||||
|
|
||||||
if ((/^localhost/).test(window.location.hostname))
|
if ((/^localhost/).test(window.location.hostname))
|
||||||
@@ -838,3 +836,11 @@ module.exports.getDisplayName = function(user) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
//IE10 does not set window.location.origin automatically so this must be called instead when using it
|
||||||
|
module.exports.getWindowLocationOrigin = function() {
|
||||||
|
if (!window.location.origin) {
|
||||||
|
window.location.origin = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port: '');
|
||||||
|
}
|
||||||
|
return window.location.origin;
|
||||||
|
};
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user