Merge branch 'desarrollo' of https://github.com/CGastrell/argenmap.jq…

…uery into desarrollo

.gitignore

@@ -20,3 +20,4 @@ Thumbs.db
 argenmap.jquery.min.js
 argenmap.jquery.js.orig
 bump.sh
+build/parse-1.2.9.min.js

build/PanZoomBarIGN.js

@@ -8,12 +8,12 @@ OpenLayers.Control.PanZoomBarIGN=OpenLayers.Class(OpenLayers.Control.PanZoom,{
 	//posizion Y del zoomBar, top de css
 	zoomBarTop:30,
 	zoomBarLeft:0,
-	zoomBarHeight:171,
+	zoomBarHeight:196,
 	zoomBar:true,
 	slider:null,
 	sliderEvents:null,
 	zoombarDiv:null,
-	forceFixedZoomLevel:false,
+	forceFixedZoomLevel:true,
 	mouseDragStart:null,
 	deltaY:null,
 	zoomStart:null,
@@ -160,8 +160,7 @@ OpenLayers.Control.PanZoomBarIGN=OpenLayers.Class(OpenLayers.Control.PanZoom,{
 			var deltaY=this.mouseDragStart.y-evt.xy.y;
 			var offsets=OpenLayers.Util.pagePosition(this.zoombarDiv);
 			if( (evt.clientY - offsets[1] - this.zoomStopHeight / 2) >  0 && (evt.clientY - offsets[1]) < this.zoomBarHeight - 2) {
-				var newTop=parseInt(this.slider.style.top) - deltaY;
-				this.slider.style.top=newTop+"px";
+				this.slider.style.top=String(parseInt(this.slider.style.top) - deltaY)+"px";
 				this.mouseDragStart=evt.xy.clone();
 			}
 			this.deltaY=this.zoomStart.y-evt.xy.y;

build/build.sh

@@ -3,6 +3,8 @@
 ./minify.sh
 ./buildOpenLayers.sh
 cat ./OpenLayers-argenmap-closure.js > ../argenmap.jquery.min.js
+#remover esto para sacar Parse, parte de las pruebas en beta
+cat parse-1.2.9.min.js >> ../argenmap.jquery.min.js
 cat argenmap.jquery.min.sinopenlayers.js >> ../argenmap.jquery.min.js
 rm argenmap.jquery.min.sinopenlayers.js