ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'three' of https://github.com/tschaub/openlayers into three

Browse Source
This commit is contained in:
Mike Adair
2012-06-19 10:18:21 -04:00
parent b0490ecdb6 8dde795baa
commit 28955dc0b1
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+4 -1
View File
@@ -2,5 +2,8 @@ all:
java -jar plovr.jar serve main.json java -jar plovr.jar serve main.json
build: build:
java -jar plovr.jar build main.json > index.js java -jar plovr.jar build main.json > index.js
jsdoc:
java -jar plovr.jar jsdoc main.json
.PHONY: build .PHONY: build
.PHONY: jsdoc
main.json
+1 -1
View File
@@ -28,5 +28,5 @@
// "undefinedVars": "ERROR" // "undefinedVars": "ERROR"
}, },
"jsdoc-html-output-path": "." "jsdoc-html-output-path": "jsdoc"
} }
src/api/bounds.js
-1
View File
@@ -31,7 +31,6 @@ ol.bounds = function(opt_arg){
var x = 0; var x = 0;
var y = 0; var y = 0;
var z; var z;
var projection;
if (goog.isArray(opt_arg)) { if (goog.isArray(opt_arg)) {
minX = opt_arg[0]; minX = opt_arg[0];