Skip to content

Commit 408d36f

Browse files
committed
feat: safari and firefox are now supported browsers
1 parent 4b1a83b commit 408d36f

File tree

5 files changed

+27
-40
lines changed

5 files changed

+27
-40
lines changed

src/extensions/default/Phoenix/html/unsupported-browser.html

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/extensions/default/Phoenix/main.js

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ define(function (require, exports, module) {
3232
Strings = brackets.getModule("strings"),
3333
Dialogs = brackets.getModule("widgets/Dialogs"),
3434
Mustache = brackets.getModule("thirdparty/mustache/mustache"),
35-
DefaultDialogs = brackets.getModule("widgets/DefaultDialogs"),
36-
unSupportedBrowserTemplate = require("text!html/unsupported-browser.html");
35+
DefaultDialogs = brackets.getModule("widgets/DefaultDialogs");
3736

3837
const PERSIST_STORAGE_DIALOG_DELAY_SECS = 60000;
3938
let $icon, unsupportedBrowserDialogShown;
@@ -60,16 +59,20 @@ define(function (require, exports, module) {
6059
if(Phoenix.browser.isMobile || Phoenix.browser.isTablet){
6160
Dialogs.showModalDialog(
6261
DefaultDialogs.DIALOG_ID_ERROR,
63-
Strings.UNSUPPORTED_BROWSER,
62+
Strings.UNSUPPORTED_BROWSER_MOBILE_TITLE,
6463
Strings.UNSUPPORTED_BROWSER_MOBILE
6564
);
6665
return;
6766
}
68-
let templateVars = {
69-
Strings: Strings,
70-
surveyURL: "https://s.surveyplanet.com/6208d1eccd51c561fc8e59ca"
71-
};
72-
Dialogs.showModalDialogUsingTemplate(Mustache.render(unSupportedBrowserTemplate, templateVars));
67+
if (!("serviceWorker" in navigator)) {
68+
// service worker is required for phcode to work
69+
Dialogs.showModalDialog(
70+
DefaultDialogs.DIALOG_ID_ERROR,
71+
Strings.UNSUPPORTED_BROWSER_TITLE,
72+
Strings.UNSUPPORTED_BROWSER_MESSAGE
73+
);
74+
throw new Error("Service worker is not supported by the browser.");
75+
}
7376
}
7477

7578
function _detectUnSupportedBrowser() {

src/index.html

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,13 @@
5151
(function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))) check = true;})(navigator.userAgent||navigator.vendor||window.opera);
5252
return check;
5353
}
54+
function isSafari() {
55+
// Safari 3.0+ "[object HTMLElementConstructor]"
56+
return /constructor/i.test(window.HTMLElement)
57+
|| (function (p) {
58+
return p.toString() === "[object SafariRemoteNotification]";
59+
})(!window['safari'] || (typeof safari !== 'undefined' && window['safari'].pushNotification));
60+
}
5461
function getBrowserDetails() {
5562
let isChrome = navigator.userAgent.indexOf("Chrome") !== -1;
5663
let isEdgeBrowser = navigator.userAgent.indexOf("Edg") !== -1;
@@ -77,7 +84,8 @@
7784
isChromeBased: isChrome,
7885
isChrome: isChromeBrowser,
7986
isEdgeChromium: isEdgeChromiumBrowser,
80-
isOperaChromium: isOperaChromiumBrowser
87+
isOperaChromium: isOperaChromiumBrowser,
88+
isSafari: isSafari()
8189
}
8290
};
8391
}

src/nls/root/strings.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -956,11 +956,12 @@ define({
956956
"ASSOCIATE_GRAPHICS_FILE_TO_DEFAULT_APP_CNF_MSG": "Following file types have been successfully associated with default applications.<br/>{0} You have the option to change your preference on whether you delete/add new file type associations in brackets.json by going to “Debug->Open Preferences File” menu.",
957957

958958
// Phoenix extension
959-
"UNSUPPORTED_BROWSER": "Browser Is Not Supported",
960-
"UNSUPPORTED_BROWSER_MOBILE": "Mobile and Tablet devices are currently not fully supported. You may close this dialogue, but some features in Phoenix will not work in this browser.",
961-
"UNSUPPORTED_BROWSER_OPEN_FOLDER": "Browser does not support Open folder. Please use Chrome, Edge or Opera to open local folders.",
962-
"UNSUPPORTED_BROWSER_MESSAGE_LINE1": "Please use one of the supported browsers below.",
963-
"UNSUPPORTED_BROWSER_MESSAGE_LINE2": " We are working hard to make Phoenix available in more browsers. You may close this dialogue, but some features in Phoenix will not work in this browser.",
959+
"UNSUPPORTED_BROWSER_TITLE": "Browser Is Not Supported",
960+
"UNSUPPORTED_BROWSER_MESSAGE": "Please use a modern browser (released within the last 3 years).",
961+
"UNSUPPORTED_BROWSER_MOBILE_TITLE": "Mobile Browsers Not Supported",
962+
"UNSUPPORTED_BROWSER_MOBILE": "Mobile and Tablet browsers are currently not fully supported. You may close this dialogue, but some features in Phoenix will not work in this browser. <br/><br/>We are working on developing native apps for iOS and Android. <a href=\"https://github.com/phcode-dev/phoenix/discussions/1046\" target=\"_blank\">Join the discussion here!</a>",
963+
"UNSUPPORTED_BROWSER_OPEN_FOLDER_TITLE": "Local Folder Access Unsupported by Browser",
964+
"UNSUPPORTED_BROWSER_OPEN_FOLDER": "Sorry, it looks like your current browser doesn't support opening local folders. For this feature, we recommend using Chrome, Edge, or Opera. <br/><br/>Alternatively, we're working on developing native apps for Windows, Mac, Linux, iOS, and Android to provide full support. <a href=\"https://github.com/phcode-dev/phoenix/discussions/1047\" target=\"_blank\">Stay tuned for updates!</a>",
964965
"CANNOT_PUBLISH_LARGE_PROJECT": "Cannot Publish Large Project",
965966
"CANNOT_PUBLISH_LARGE_PROJECT_MESSAGE": "Phoenix is still in experimental alpha. We have not yet enabled sync of projects with greater than 500 files.",
966967
"SHARE_WEBSITE": "Publish and Share Website?",

src/project/ProjectManager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1158,7 +1158,7 @@ define(function (require, exports, module) {
11581158
if(!path && !window.showOpenFilePicker){
11591159
Dialogs.showModalDialog(
11601160
DefaultDialogs.DIALOG_ID_ERROR,
1161-
Strings.UNSUPPORTED_BROWSER,
1161+
Strings.UNSUPPORTED_BROWSER_OPEN_FOLDER_TITLE,
11621162
Strings.UNSUPPORTED_BROWSER_OPEN_FOLDER
11631163
);
11641164
result.reject();

0 commit comments

Comments
 (0)