diff --git a/bin/loader_hosted_examples.js b/bin/loader_hosted_examples.js index 19c5d2ae04..d5dda87429 100644 --- a/bin/loader_hosted_examples.js +++ b/bin/loader_hosted_examples.js @@ -5,7 +5,7 @@ * This loader is used for the hosted examples. It is used in place of the * development loader (examples/loader.js). * - * ol.css, ol.js, ol-simple.js, ol-whitespace.js, and ol-deps.js are built + * ol.js, ol-simple.js, ol-whitespace.js, and ol-deps.js are built * by OL3's build.py script. They are located in the ../build/ directory, * relatively to this script. * @@ -66,7 +66,6 @@ } var scriptId = encodeURIComponent(scriptParams.id); - document.write(''); if (mode != 'raw') { document.write(''); } else { diff --git a/build.py b/build.py index 741389d301..a12d7e3100 100755 --- a/build.py +++ b/build.py @@ -675,17 +675,21 @@ def host_resources(t): def host_examples(t): examples_dir = 'build/hosted/%(BRANCH)s/examples' build_dir = 'build/hosted/%(BRANCH)s/build' + css_dir = 'build/hosted/%(BRANCH)s/css' t.rm_rf(examples_dir) t.makedirs(examples_dir) t.rm_rf(build_dir) t.makedirs(build_dir) + t.rm_rf(css_dir) + t.makedirs(css_dir) t.cp(EXAMPLES, examples_dir) for example in [path.replace('.html', '.js') for path in EXAMPLES]: split_example_file(example, examples_dir % vars(variables)) t.cp_r('examples/data', examples_dir + '/data') t.cp('bin/loader_hosted_examples.js', examples_dir + '/loader.js') t.cp('build/ol.js', 'build/ol-simple.js', 'build/ol-whitespace.js', - 'build/ol.css', build_dir) + build_dir) + t.cp('build/ol.css', css_dir) t.cp('examples/index.html', 'examples/example-list.js', 'examples/example-list.xml', 'examples/Jugl.js', 'examples/jquery.min.js', examples_dir) diff --git a/examples/accessible.html b/examples/accessible.html index c5eb97bfc8..7e20122bbf 100644 --- a/examples/accessible.html +++ b/examples/accessible.html @@ -4,6 +4,7 @@ + diff --git a/examples/animation.html b/examples/animation.html index f309780e88..0a5e243ae9 100644 --- a/examples/animation.html +++ b/examples/animation.html @@ -4,6 +4,7 @@ + diff --git a/examples/bind-input.html b/examples/bind-input.html index f1015f7497..eed518bac2 100644 --- a/examples/bind-input.html +++ b/examples/bind-input.html @@ -4,6 +4,7 @@ + diff --git a/examples/bing-maps.html b/examples/bing-maps.html index a55bf4bd0d..38247f3ad8 100644 --- a/examples/bing-maps.html +++ b/examples/bing-maps.html @@ -4,6 +4,7 @@ + diff --git a/examples/brightness-contrast.html b/examples/brightness-contrast.html index df6ceaf063..5b3379559f 100644 --- a/examples/brightness-contrast.html +++ b/examples/brightness-contrast.html @@ -4,6 +4,7 @@ + diff --git a/examples/canvas-tiles.html b/examples/canvas-tiles.html index e87f2c8ad0..5685427bd8 100644 --- a/examples/canvas-tiles.html +++ b/examples/canvas-tiles.html @@ -4,6 +4,7 @@ + diff --git a/examples/custom-controls.html b/examples/custom-controls.html index 46b170e745..b7e29659b2 100644 --- a/examples/custom-controls.html +++ b/examples/custom-controls.html @@ -4,6 +4,7 @@ + diff --git a/examples/d3.html b/examples/d3.html index 3e00f0b828..bad878f6ff 100644 --- a/examples/d3.html +++ b/examples/d3.html @@ -4,6 +4,7 @@ + diff --git a/examples/device-orientation.html b/examples/device-orientation.html index 90004e444f..ce77ce1fe2 100644 --- a/examples/device-orientation.html +++ b/examples/device-orientation.html @@ -4,6 +4,7 @@ + diff --git a/examples/drag-and-drop-image-vector.html b/examples/drag-and-drop-image-vector.html index ebd65e302d..560a366fca 100644 --- a/examples/drag-and-drop-image-vector.html +++ b/examples/drag-and-drop-image-vector.html @@ -4,6 +4,7 @@ + diff --git a/examples/drag-and-drop.html b/examples/drag-and-drop.html index 965af91ee7..2fe135ee7a 100644 --- a/examples/drag-and-drop.html +++ b/examples/drag-and-drop.html @@ -4,6 +4,7 @@ + diff --git a/examples/drag-rotate-and-zoom.html b/examples/drag-rotate-and-zoom.html index dc4cfaf107..3af2ccc57c 100644 --- a/examples/drag-rotate-and-zoom.html +++ b/examples/drag-rotate-and-zoom.html @@ -4,6 +4,7 @@ + diff --git a/examples/draw-features.html b/examples/draw-features.html index 0df6aae29d..2c6b9b980b 100644 --- a/examples/draw-features.html +++ b/examples/draw-features.html @@ -4,6 +4,7 @@ + diff --git a/examples/dynamic-data.html b/examples/dynamic-data.html index 992be0daf6..19dd30384e 100644 --- a/examples/dynamic-data.html +++ b/examples/dynamic-data.html @@ -4,6 +4,7 @@ + diff --git a/examples/epsg-4326.html b/examples/epsg-4326.html index f3ae7f1f65..7ae08f7f98 100644 --- a/examples/epsg-4326.html +++ b/examples/epsg-4326.html @@ -4,6 +4,7 @@ + diff --git a/examples/export-map.html b/examples/export-map.html index 5572181f4c..59bb69cb58 100644 --- a/examples/export-map.html +++ b/examples/export-map.html @@ -4,6 +4,7 @@ + diff --git a/examples/full-screen-drag-rotate-and-zoom.html b/examples/full-screen-drag-rotate-and-zoom.html index 1c2567382a..35ab25bda2 100644 --- a/examples/full-screen-drag-rotate-and-zoom.html +++ b/examples/full-screen-drag-rotate-and-zoom.html @@ -4,6 +4,7 @@ + diff --git a/examples/full-screen.html b/examples/full-screen.html index a0a7625b18..c2b64576df 100644 --- a/examples/full-screen.html +++ b/examples/full-screen.html @@ -4,6 +4,7 @@ + diff --git a/examples/geojson.html b/examples/geojson.html index 6822e40ff0..6940eaa355 100644 --- a/examples/geojson.html +++ b/examples/geojson.html @@ -4,6 +4,7 @@ + diff --git a/examples/geolocation.html b/examples/geolocation.html index b3ffc85cbe..563cce8ff9 100644 --- a/examples/geolocation.html +++ b/examples/geolocation.html @@ -4,6 +4,7 @@ + diff --git a/examples/getfeatureinfo.html b/examples/getfeatureinfo.html index 930e96193c..3dbf140f31 100644 --- a/examples/getfeatureinfo.html +++ b/examples/getfeatureinfo.html @@ -5,6 +5,7 @@ + diff --git a/examples/google-map.html b/examples/google-map.html index 742b1b4315..6255b50033 100644 --- a/examples/google-map.html +++ b/examples/google-map.html @@ -5,6 +5,7 @@ + diff --git a/examples/gpx.html b/examples/gpx.html index 5598433633..26b6eef474 100644 --- a/examples/gpx.html +++ b/examples/gpx.html @@ -4,6 +4,7 @@ + diff --git a/examples/hue-saturation.html b/examples/hue-saturation.html index bcfd702c95..c831392c3b 100644 --- a/examples/hue-saturation.html +++ b/examples/hue-saturation.html @@ -4,6 +4,7 @@ + diff --git a/examples/icon.html b/examples/icon.html index 5cbc9ae9b0..c02a14bd65 100644 --- a/examples/icon.html +++ b/examples/icon.html @@ -4,6 +4,7 @@ + diff --git a/examples/igc.html b/examples/igc.html index 8fb12d19b8..a28236940f 100644 --- a/examples/igc.html +++ b/examples/igc.html @@ -4,6 +4,7 @@ + diff --git a/examples/image-vector-layer.html b/examples/image-vector-layer.html index 86513c1422..02be37d0fb 100644 --- a/examples/image-vector-layer.html +++ b/examples/image-vector-layer.html @@ -4,6 +4,7 @@ + diff --git a/examples/index.html b/examples/index.html index 1d101f6fb7..696db3930d 100644 --- a/examples/index.html +++ b/examples/index.html @@ -4,6 +4,7 @@ + diff --git a/examples/kml-earthquakes.html b/examples/kml-earthquakes.html index f02c33bfc6..98ba3499fc 100644 --- a/examples/kml-earthquakes.html +++ b/examples/kml-earthquakes.html @@ -4,6 +4,7 @@ + diff --git a/examples/kml-timezones.html b/examples/kml-timezones.html index aa3b2537e1..ff24ffff5e 100644 --- a/examples/kml-timezones.html +++ b/examples/kml-timezones.html @@ -4,6 +4,7 @@ + diff --git a/examples/kml.html b/examples/kml.html index 0ee852dc8a..94fab3bb08 100644 --- a/examples/kml.html +++ b/examples/kml.html @@ -4,6 +4,7 @@ + diff --git a/examples/layer-clipping-webgl.html b/examples/layer-clipping-webgl.html index b6cc0b1f23..bd8dbb4f56 100644 --- a/examples/layer-clipping-webgl.html +++ b/examples/layer-clipping-webgl.html @@ -4,6 +4,7 @@ + diff --git a/examples/layer-clipping.html b/examples/layer-clipping.html index 80631eacda..fc70da2808 100644 --- a/examples/layer-clipping.html +++ b/examples/layer-clipping.html @@ -4,6 +4,7 @@ + diff --git a/examples/layer-group.html b/examples/layer-group.html index 99a4542ee5..450cdac1f3 100644 --- a/examples/layer-group.html +++ b/examples/layer-group.html @@ -4,6 +4,7 @@ + diff --git a/examples/layer-spy.html b/examples/layer-spy.html index f2655c9c5b..613f16db43 100644 --- a/examples/layer-spy.html +++ b/examples/layer-spy.html @@ -4,6 +4,7 @@ + diff --git a/examples/layer-swipe.html b/examples/layer-swipe.html index 70054b2e05..6c4450f256 100644 --- a/examples/layer-swipe.html +++ b/examples/layer-swipe.html @@ -4,6 +4,7 @@ + diff --git a/examples/loader.js b/examples/loader.js index e1cb108cc8..603b500d29 100644 --- a/examples/loader.js +++ b/examples/loader.js @@ -59,7 +59,6 @@ pairs.push(encodeURIComponent(key) + '=' + encodeURIComponent(params[key])); } - document.write(''); var url = 'http://' + host + '/compile?' + pairs.join('&'); document.write(''); }()); diff --git a/examples/localized-openstreetmap.html b/examples/localized-openstreetmap.html index b5b0f659ec..4405f6702f 100644 --- a/examples/localized-openstreetmap.html +++ b/examples/localized-openstreetmap.html @@ -4,6 +4,7 @@ + diff --git a/examples/mapguide-untiled.html b/examples/mapguide-untiled.html index 8103538bbc..47cf6be91a 100644 --- a/examples/mapguide-untiled.html +++ b/examples/mapguide-untiled.html @@ -4,6 +4,7 @@ + diff --git a/examples/mapquest.html b/examples/mapquest.html index 78069a1a79..78e638d2f3 100644 --- a/examples/mapquest.html +++ b/examples/mapquest.html @@ -4,6 +4,7 @@ + diff --git a/examples/min-max-resolution.html b/examples/min-max-resolution.html index c99f592a60..cce4c11a8f 100644 --- a/examples/min-max-resolution.html +++ b/examples/min-max-resolution.html @@ -4,6 +4,7 @@ + diff --git a/examples/modify-features.html b/examples/modify-features.html index b4ac93300a..6eb41028f5 100644 --- a/examples/modify-features.html +++ b/examples/modify-features.html @@ -5,6 +5,7 @@ + diff --git a/examples/mouse-position.html b/examples/mouse-position.html index 57eedf9f08..3f7bc13f0f 100644 --- a/examples/mouse-position.html +++ b/examples/mouse-position.html @@ -4,6 +4,7 @@ + diff --git a/examples/moveend.html b/examples/moveend.html index c7e172bffd..76c777bf1e 100644 --- a/examples/moveend.html +++ b/examples/moveend.html @@ -4,6 +4,7 @@ + diff --git a/examples/navigation-controls.html b/examples/navigation-controls.html index 3e9b6e83d2..6bbdd5b142 100644 --- a/examples/navigation-controls.html +++ b/examples/navigation-controls.html @@ -4,6 +4,7 @@ + diff --git a/examples/overlay.html b/examples/overlay.html index ca6aed2dfb..051ef2832a 100644 --- a/examples/overlay.html +++ b/examples/overlay.html @@ -4,6 +4,7 @@ + diff --git a/examples/popup.html b/examples/popup.html index b9905de2d4..b126b40e21 100644 --- a/examples/popup.html +++ b/examples/popup.html @@ -4,6 +4,7 @@ + diff --git a/examples/preload.html b/examples/preload.html index 404e051448..99c887b02e 100644 --- a/examples/preload.html +++ b/examples/preload.html @@ -4,6 +4,7 @@ + diff --git a/examples/rotation.html b/examples/rotation.html index aa3c8b6939..067faf4f94 100644 --- a/examples/rotation.html +++ b/examples/rotation.html @@ -4,6 +4,7 @@ + diff --git a/examples/rtree.html b/examples/rtree.html index ddd884d7d4..937100ce3b 100644 --- a/examples/rtree.html +++ b/examples/rtree.html @@ -4,6 +4,7 @@ + diff --git a/examples/scale-line.html b/examples/scale-line.html index 59088591d5..0adb832f64 100644 --- a/examples/scale-line.html +++ b/examples/scale-line.html @@ -4,6 +4,7 @@ + diff --git a/examples/select-features.html b/examples/select-features.html index 3c6ba449b1..3a5f68caef 100644 --- a/examples/select-features.html +++ b/examples/select-features.html @@ -5,6 +5,7 @@ + diff --git a/examples/semi-transparent-layer.html b/examples/semi-transparent-layer.html index dea696a910..8212064285 100644 --- a/examples/semi-transparent-layer.html +++ b/examples/semi-transparent-layer.html @@ -4,6 +4,7 @@ + diff --git a/examples/side-by-side.html b/examples/side-by-side.html index 110bb52cfa..bfc0c6e6d4 100644 --- a/examples/side-by-side.html +++ b/examples/side-by-side.html @@ -4,6 +4,7 @@ + diff --git a/examples/simple.html b/examples/simple.html index d4094bcab2..141804864a 100644 --- a/examples/simple.html +++ b/examples/simple.html @@ -4,6 +4,7 @@ + diff --git a/examples/stamen.html b/examples/stamen.html index 32d898b3e6..2632526560 100644 --- a/examples/stamen.html +++ b/examples/stamen.html @@ -4,6 +4,7 @@ + diff --git a/examples/static-image.html b/examples/static-image.html index b7ecc10d39..47da86cf2b 100644 --- a/examples/static-image.html +++ b/examples/static-image.html @@ -4,6 +4,7 @@ + diff --git a/examples/synthetic-lines.html b/examples/synthetic-lines.html index 56f4ed371a..50cb31c7bf 100644 --- a/examples/synthetic-lines.html +++ b/examples/synthetic-lines.html @@ -4,6 +4,7 @@ + diff --git a/examples/synthetic-points.html b/examples/synthetic-points.html index 8641921d7d..60cc6ddb71 100644 --- a/examples/synthetic-points.html +++ b/examples/synthetic-points.html @@ -4,6 +4,7 @@ + diff --git a/examples/teleport.html b/examples/teleport.html index c6872207af..d8bcad8297 100644 --- a/examples/teleport.html +++ b/examples/teleport.html @@ -4,6 +4,7 @@ + diff --git a/examples/tilejson.html b/examples/tilejson.html index ba84809a47..c2b395eacc 100644 --- a/examples/tilejson.html +++ b/examples/tilejson.html @@ -4,6 +4,7 @@ + diff --git a/examples/topojson.html b/examples/topojson.html index 4fd4099299..5b013712dc 100644 --- a/examples/topojson.html +++ b/examples/topojson.html @@ -5,6 +5,7 @@ + diff --git a/examples/vector-layer.html b/examples/vector-layer.html index c2d20f4fbf..fd2ff074f2 100644 --- a/examples/vector-layer.html +++ b/examples/vector-layer.html @@ -4,6 +4,7 @@ + diff --git a/examples/wms-capabilities.html b/examples/wms-capabilities.html index 11ffa869b3..aa12e92a6e 100644 --- a/examples/wms-capabilities.html +++ b/examples/wms-capabilities.html @@ -4,6 +4,7 @@ + diff --git a/examples/wms-custom-proj.html b/examples/wms-custom-proj.html index f7fd18cdfd..76272372f3 100644 --- a/examples/wms-custom-proj.html +++ b/examples/wms-custom-proj.html @@ -4,6 +4,7 @@ + diff --git a/examples/wms-image-custom-proj.html b/examples/wms-image-custom-proj.html index ce714bfcb6..42139a8e36 100644 --- a/examples/wms-image-custom-proj.html +++ b/examples/wms-image-custom-proj.html @@ -4,6 +4,7 @@ + diff --git a/examples/wms-image.html b/examples/wms-image.html index 18b504fa22..eda700382d 100644 --- a/examples/wms-image.html +++ b/examples/wms-image.html @@ -4,6 +4,7 @@ + diff --git a/examples/wms-no-proj.html b/examples/wms-no-proj.html index 7d7fffef8b..160fdb0ab3 100644 --- a/examples/wms-no-proj.html +++ b/examples/wms-no-proj.html @@ -4,6 +4,7 @@ + diff --git a/examples/wms-tiled.html b/examples/wms-tiled.html index ccaa34b915..74d3005de1 100644 --- a/examples/wms-tiled.html +++ b/examples/wms-tiled.html @@ -4,6 +4,7 @@ + diff --git a/examples/wmts.html b/examples/wmts.html index 8919494ebd..508bf3c54d 100644 --- a/examples/wmts.html +++ b/examples/wmts.html @@ -4,6 +4,7 @@ + diff --git a/examples/xyz-esri.html b/examples/xyz-esri.html index f64a9ae171..e6e92de808 100644 --- a/examples/xyz-esri.html +++ b/examples/xyz-esri.html @@ -4,6 +4,7 @@ + diff --git a/examples/zoomify.html b/examples/zoomify.html index 39b88628b2..af04c0674e 100644 --- a/examples/zoomify.html +++ b/examples/zoomify.html @@ -4,6 +4,7 @@ + diff --git a/examples/zoomslider.html b/examples/zoomslider.html index 6d0c1fff4f..ba47a3be67 100644 --- a/examples/zoomslider.html +++ b/examples/zoomslider.html @@ -4,6 +4,7 @@ +