Merge branch 'master' of github.com:openlayers/ol3 into wms-improvements

Conflicts: src/ol/source/tiledwmssource.js test/spec/ol/tileurlfunction.test.js
2013-03-05 00:55:52 +01:00
parent 586f393492 1bac674eca
commit 66b790294d
49 changed files with 647 additions and 248 deletions
@@ -17,6 +17,7 @@ goog.require('ol.tilegrid.TileGrid');
 * @typedef {{attributions: (Array.<ol.Attribution>|undefined),
 *            crossOrigin: (null|string|undefined),
 *            extent: (ol.Extent|undefined),
+ *            opaque: (boolean|undefined),
 *            projection: (ol.Projection|undefined),
 *            tileGrid: (ol.tilegrid.TileGrid|undefined),
 *            tileUrlFunction: (ol.TileUrlFunctionType|undefined)}}
@@ -35,6 +36,7 @@ ol.source.ImageTileSource = function(options) {
  goog.base(this, {
    attributions: options.attributions,
    extent: options.extent,
+    opaque: options.opaque,
    projection: options.projection,
    tileGrid: options.tileGrid
  });