[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Wrap localStorage.getItem calls in try { ... } catch () {}

2016-12-15 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/327663 )

Change subject: Wrap localStorage.getItem calls in try { ... } catch () {}
..


Wrap localStorage.getItem calls in try { ... } catch () {}

Bug: T153291
Change-Id: Ic4f8c390bfe6936bd182b28b1f2c6d19bf459eba
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
2 files changed, 13 insertions(+), 4 deletions(-)

Approvals:
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved



diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 2abcf62..7c8b6d0 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -830,7 +830,8 @@
isLoggedIn = !mw.user.isAnon(),
prefSaysShowWelcome = isLoggedIn && 
!mw.user.options.get( 'visualeditor-hidebetawelcome' ),
urlSaysHideWelcome = 'hidewelcomedialog' in new mw.Uri( 
location.href ).query,
-   action = 'edit';
+   action = 'edit',
+   welcomeDialogLocalStorageValue = null;
 
if ( uri.query.action === 'edit' && $( '#wpTextbox1' ).length ) 
{
initialWikitext = $( '#wpTextbox1' ).textSelection( 
'getContents' );
@@ -1067,6 +1068,9 @@
}
}
 
+   try {
+   welcomeDialogLocalStorageValue = localStorage.getItem( 
've-beta-welcome-dialog' );
+   } catch ( e ) {}
if (
showWikitextWelcome &&
mw.config.get( 'wgVisualEditorConfig' ).showBetaWelcome 
&&
@@ -1076,7 +1080,7 @@
prefSaysShowWelcome ||
(
!isLoggedIn &&
-   localStorage.getItem( 
've-beta-welcome-dialog' ) === null &&
+   welcomeDialogLocalStorageValue === null 
&&
$.cookie( 've-beta-welcome-dialog' ) 
=== null
)
)
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 848de5a..33a4d8f 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -1959,7 +1959,12 @@
 ve.init.mw.ArticleTarget.prototype.maybeShowWelcomeDialog = function () {
var usePrefs, prefSaysShow, urlSaysHide,
windowManager = this.getSurface().dialogs,
-   target = this;
+   target = this,
+   welcomeDialogLocalStorageValue = null;
+
+   try {
+   welcomeDialogLocalStorageValue = localStorage.getItem( 
've-beta-welcome-dialog' );
+   } catch ( e ) {}
 
this.welcomeDialogPromise = $.Deferred();
 
@@ -1980,7 +1985,7 @@
prefSaysShow ||
(
!usePrefs &&
-   localStorage.getItem( 
've-beta-welcome-dialog' ) === null &&
+   welcomeDialogLocalStorageValue === null 
&&
$.cookie( 've-beta-welcome-dialog' ) 
=== null
)
)

-- 
To view, visit https://gerrit.wikimedia.org/r/327663
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4f8c390bfe6936bd182b28b1f2c6d19bf459eba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Wrap localStorage.getItem calls in try { ... } catch () {}

2016-12-15 Thread Alex Monk (Code Review) 
Alex Monk has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/327663 )

Change subject: Wrap localStorage.getItem calls in try { ... } catch () {}
..

Wrap localStorage.getItem calls in try { ... } catch () {}

Bug: T153291
Change-Id: Ic4f8c390bfe6936bd182b28b1f2c6d19bf459eba
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
2 files changed, 13 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/63/327663/1

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 2abcf62..7c8b6d0 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -830,7 +830,8 @@
isLoggedIn = !mw.user.isAnon(),
prefSaysShowWelcome = isLoggedIn && 
!mw.user.options.get( 'visualeditor-hidebetawelcome' ),
urlSaysHideWelcome = 'hidewelcomedialog' in new mw.Uri( 
location.href ).query,
-   action = 'edit';
+   action = 'edit',
+   welcomeDialogLocalStorageValue = null;
 
if ( uri.query.action === 'edit' && $( '#wpTextbox1' ).length ) 
{
initialWikitext = $( '#wpTextbox1' ).textSelection( 
'getContents' );
@@ -1067,6 +1068,9 @@
}
}
 
+   try {
+   welcomeDialogLocalStorageValue = localStorage.getItem( 
've-beta-welcome-dialog' );
+   } catch ( e ) {}
if (
showWikitextWelcome &&
mw.config.get( 'wgVisualEditorConfig' ).showBetaWelcome 
&&
@@ -1076,7 +1080,7 @@
prefSaysShowWelcome ||
(
!isLoggedIn &&
-   localStorage.getItem( 
've-beta-welcome-dialog' ) === null &&
+   welcomeDialogLocalStorageValue === null 
&&
$.cookie( 've-beta-welcome-dialog' ) 
=== null
)
)
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 848de5a..33a4d8f 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -1959,7 +1959,12 @@
 ve.init.mw.ArticleTarget.prototype.maybeShowWelcomeDialog = function () {
var usePrefs, prefSaysShow, urlSaysHide,
windowManager = this.getSurface().dialogs,
-   target = this;
+   target = this,
+   welcomeDialogLocalStorageValue = null;
+
+   try {
+   welcomeDialogLocalStorageValue = localStorage.getItem( 
've-beta-welcome-dialog' );
+   } catch ( e ) {}
 
this.welcomeDialogPromise = $.Deferred();
 
@@ -1980,7 +1985,7 @@
prefSaysShow ||
(
!usePrefs &&
-   localStorage.getItem( 
've-beta-welcome-dialog' ) === null &&
+   welcomeDialogLocalStorageValue === null 
&&
$.cookie( 've-beta-welcome-dialog' ) 
=== null
)
)

-- 
To view, visit https://gerrit.wikimedia.org/r/327663
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4f8c390bfe6936bd182b28b1f2c6d19bf459eba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits