From 2e5ec59c2b3aac5755f95fc7a80f684505df1258 Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Tue, 30 Sep 2008 12:58:39 -0700 Subject: [PATCH] Changed the warning about Safari/Chrome/Opera incompatibility to be an in-page message instead of a popup alert so as to be slightly less obnoxious. --- NEWS | 3 +++ config/Version.py | 2 +- static/js/Wiki.js | 8 +++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 2f49be3..fb95b48 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,9 @@ stripped out when exporting to CSV. * Fixed a bug in which clicking the "export" link when the current note was unsaved did not open the export pulldown. + * Changed the warning about Safari/Chrome/Opera incompatibility to be an + in-page message instead of a popup alert so as to be slightly less + obnoxious. 1.5.1: September 28, 2008 * Implemented CSV exporting, so now you can export all of your notes to a diff --git a/config/Version.py b/config/Version.py index 62e2669..b7cc6e3 100644 --- a/config/Version.py +++ b/config/Version.py @@ -1 +1 @@ -VERSION = u"1.5.1" +VERSION = u"1.5.2" diff --git a/static/js/Wiki.js b/static/js/Wiki.js index 2a14f78..8a2e110 100644 --- a/static/js/Wiki.js +++ b/static/js/Wiki.js @@ -50,13 +50,15 @@ function Wiki( invoker ) { if ( this.notebook && this.notebook.read_write ) { unsupported_agent = null; - if ( /Safari/.test( navigator.userAgent ) ) + if ( /Chrome/.test( navigator.userAgent ) ) + unsupported_agent = "Chrome"; + else if ( /Safari/.test( navigator.userAgent ) ) unsupported_agent = "Safari"; - if ( /Opera/.test( navigator.userAgent ) ) + else if ( /Opera/.test( navigator.userAgent ) ) unsupported_agent = "Opera"; if ( unsupported_agent ) - alert( "Luminotes does not currently support the " + unsupported_agent + " web browser for editing. If possible, please use Firefox or Internet Explorer instead. " + unsupported_agent + " support will be added in a future release. Sorry for the inconvenience." ); + this.display_message( "Luminotes does not currently support the " + unsupported_agent + " web browser for editing. If possible, please use Firefox or Internet Explorer instead. " + unsupported_agent + " support will be added in a future release. Sorry for the inconvenience." ); } var deleted_id = getElement( "deleted_id" ).value;