jenkins-bot has submitted this change and it was merged.

Change subject: More specific #defaultView:… regular expression
......................................................................


More specific #defaultView:… regular expression

We know all browsers have plain ASCII names without spaces and such.

Change-Id: I4b81f772fb3d515cbab152f18310da3b7ed8c250
---
M embed.html
M wikibase/queryService/ui/App.js
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Jonas Kress (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/embed.html b/embed.html
index 23d9e18..d313dd1 100644
--- a/embed.html
+++ b/embed.html
@@ -110,7 +110,7 @@
                        var browserPackage = 
wikibase.queryService.ui.resultBrowser;
 
                        try {
-                               var browserClass = RESULT_BROWSER[query.match( 
/\#defaultView:(.*)/ )[1]].class;
+                               var browserClass = RESULT_BROWSER[query.match( 
/#defaultView:(\w+)/ )[1]].class;
                                var browser = new 
browserPackage[browserClass]();
                        } catch ( e ) {
                                var browserClass = RESULT_BROWSER.Table.class;
diff --git a/wikibase/queryService/ui/App.js b/wikibase/queryService/ui/App.js
index b20e3c5..2a2e71e 100644
--- a/wikibase/queryService/ui/App.js
+++ b/wikibase/queryService/ui/App.js
@@ -627,7 +627,7 @@
         * @private
         */
        SELF.prototype._getDefaultResultBrowser = function() {
-               var match = this._editor.getValue().match( /\#defaultView:(.*)/ 
);
+               var match = this._editor.getValue().match( /#defaultView:(\w+)/ 
);
 
                if ( match && this._resultBrowsers[match[1]] ) {
                        return match[1];

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b81f772fb3d515cbab152f18310da3b7ed8c250
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to