Merge pull request #4387 from ahocevar/common-renderer-default

Add default argument to getRendererFromQueryString

examples/icon-sprite-webgl.js

@@ -78,14 +78,8 @@ var vector = new ol.layer.Vector({
   source: vectorSource
 });
 
-// Use the "webgl" renderer by default.
-var renderer = common.getRendererFromQueryString();
-if (!renderer) {
-  renderer = 'webgl';
-}
-
 var map = new ol.Map({
-  renderer: renderer,
+  renderer: common.getRendererFromQueryString('webgl'),
   layers: [vector],
   target: document.getElementById('map'),
   view: new ol.View({

examples/resources/common.js

@@ -83,7 +83,7 @@
 
 var common = {};
 
-common.getRendererFromQueryString = function() {
+common.getRendererFromQueryString = function(opt_default) {
   var obj = {};
   var queryString = location.search.slice(1);
   var re = /([^&=]+)=([^&]*)/g;
@@ -98,6 +98,6 @@ common.getRendererFromQueryString = function() {
   } else if ('renderer' in obj) {
     return [obj['renderer']];
   } else {
-    return undefined;
+    return opt_default;
   }
 };

examples/symbol-atlas-webgl.js

@@ -106,14 +106,8 @@ var vector = new ol.layer.Vector({
   source: vectorSource
 });
 
-// Use the "webgl" renderer by default.
-var renderer = common.getRendererFromQueryString();
-if (!renderer) {
-  renderer = 'webgl';
-}
-
 var map = new ol.Map({
-  renderer: renderer,
+  renderer: common.getRendererFromQueryString('webgl'),
   layers: [vector],
   target: document.getElementById('map'),
   view: new ol.View({

externs/example.js

@@ -6,9 +6,10 @@ var common;
 
 
 /**
+ * @param {string=} opt_default Default renderer.
  * @return {string} Renderer type.
  */
-common.getRendererFromQueryString = function() {};
+common.getRendererFromQueryString = function(opt_default) {};
 
 
 /**