IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-02 05:29:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: hack was actually messing with other browsers

Browse Source
This commit is contained in:
Régis Hanol 2015-05-29 17:31:21 +02:00
parent 0aa552cf61
commit 766b054e6c
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/discourse/views/upload-selector.js.es6
View File

@ -10,13 +10,18 @@ export default ModalBodyView.extend({
templateName: 'modal/upload_selector', templateName: 'modal/upload_selector',
classNames: ['upload-selector'], classNames: ['upload-selector'],
// cf. http://stackoverflow.com/a/9851769/11983
isOpera: !!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0,
isFirefox: typeof InstallTrigger !== 'undefined',
isSafari: Object.prototype.toString.call(window.HTMLElement).indexOf('Constructor') > 0,
isChrome: !!window.chrome && !this.isOpera,
title: function() { return uploadTranslate("title"); }.property(), title: function() { return uploadTranslate("title"); }.property(),
uploadIcon: function() { return Discourse.Utilities.allowsAttachments() ? "fa-upload" : "fa-picture-o"; }.property(), uploadIcon: function() { return Discourse.Utilities.allowsAttachments() ? "fa-upload" : "fa-picture-o"; }.property(),
touchStart: function(evt) { touchStart: function(evt) {
// HACK: workaround Safari iOS being really weird and not shipping click events // HACK: workaround Safari iOS being really weird and not shipping click events
// should be fairly harmless on other touch devices if (this.isSafari && evt.target.id === "filename-input") {
if (evt.target.id === "filename-input") {
this.$('#filename-input').click(); this.$('#filename-input').click();
} }
}, },
@ -28,10 +33,7 @@ export default ModalBodyView.extend({
}.property("controller.local"), }.property("controller.local"),
hint: function() { hint: function() {
// cf. http://stackoverflow.com/a/9851769/11983 const isSupported = this.isChrome || this.isFirefox;
const isChrome = !!window.chrome && !(!!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0),
isFirefox = typeof InstallTrigger !== 'undefined',
isSupported = isChrome || isFirefox;
// chrome is the only browser that support copy & paste of images. // chrome is the only browser that support copy & paste of images.
return I18n.t("upload_selector.hint" + (isSupported ? "_for_supported_browsers" : "")); return I18n.t("upload_selector.hint" + (isSupported ? "_for_supported_browsers" : ""));
}.property(), }.property(),