[Mapbender-commits] r4722 - in trunk/mapbender: http/javascripts lib resources/db/pgsql/UTF-8/update

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2009-09-26 11:33:14 -0400 (Sat, 26 Sep 2009)
New Revision: 4722

Removed:
   trunk/mapbender/http/javascripts/mod_selArea1.php
Modified:
   trunk/mapbender/http/javascripts/mod_zoomOut1.js
   trunk/mapbender/lib/point.js
   trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6_to_2.7rc1_pgsql_UTF-8.sql
Log:


Deleted: trunk/mapbender/http/javascripts/mod_selArea1.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_selArea1.php	2009-09-26 15:32:40 UTC (rev 4721)
+++ trunk/mapbender/http/javascripts/mod_selArea1.php	2009-09-26 15:33:14 UTC (rev 4722)
@@ -1,74 +0,0 @@
-<?php
-# $Id$
-# http://www.mapbender.org/index.php/mod_selArea1.php
-# Copyright (C) 2002 CCGIS 
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-?>
-var mod_selArea_elName = "<?php echo $e_id;?>";
-var mod_selArea_frameName = "";
-var mod_selArea_target = "<?php echo $e_target[0]; ?>";
-
-var mod_selArea_MapObj = null;
-var mod_selArea_img_on = new Image(); 
-mod_selArea_img_on.src = "<?php  echo preg_replace("/_off/","_on",$e_src);  ?>";
-var mod_selArea_img_off = new Image(); 
-mod_selArea_img_off.src = "<?php  echo $e_src;  ?>";
-var mod_selArea_img_over = new Image(); 
-mod_selArea_img_over.src = "<?php  echo preg_replace("/_off/","_over",$e_src);  ?>";
-
-eventInit.register(function () {
-	mb_regButton(function (ind) {
-		mod_selArea_MapObj = getMapObjByName(mod_selArea_target);
-		mb_button[ind] = document.getElementById(mod_selArea_elName);
-		mb_button[ind].img_over = mod_selArea_img_over.src;
-		mb_button[ind].img_on = mod_selArea_img_on.src;
-		mb_button[ind].img_off = mod_selArea_img_off.src;
-		mb_button[ind].status = 0;
-		mb_button[ind].elName = mod_selArea_elName;
-		mb_button[ind].fName = mod_selArea_frameName;
-		mb_button[ind].go = function () {
-			mod_selArea_click();
-		};
-		mb_button[ind].stop = function () {
-			mod_selArea_disable();
-		};
-	});
-});
-
-function mod_selArea_click(){
-	var el = mod_selArea_MapObj.getDomElement();
-	el.onmouseover = mod_selArea_init;
-	el.onmousedown = mod_box_start;
-	el.onmouseup = mod_selArea_get;
-	el.onmousemove = mod_box_run;
-}
-function mod_selArea_disable(){
-	var el = mod_selArea_MapObj.getDomElement();
-	el.onmousedown = null;
-	el.onmouseup = null;
-	el.onmousemove = null;
-}
-function mod_selArea_init(e){
-	mb_isBF = mod_selArea_target;
-	mb_zF = mod_selArea_target;
-}
-function mod_selArea_get(e){
-	mb_isBF = mod_selArea_target;
-	mb_zF = mod_selArea_target;
-	mod_box_setValidClipping(mod_box_stop(e));
-}

Modified: trunk/mapbender/http/javascripts/mod_zoomOut1.js
===================================================================
--- trunk/mapbender/http/javascripts/mod_zoomOut1.js	2009-09-26 15:32:40 UTC (rev 4721)
+++ trunk/mapbender/http/javascripts/mod_zoomOut1.js	2009-09-26 15:33:14 UTC (rev 4722)
@@ -32,12 +32,10 @@
  * http://svn.osgeo.org/mapbender/trunk/mapbender/license/license.txt
  */
 $(this).click(function () {
-	if (!options.target) {
+	if (!options.target
+		|| !Mapbender.modules[options.target]) {
 		return;
 	}
-	if (!Mapbender.modules[options.target]) {
-		return;
-	}
 	Mapbender.modules[options.target].zoom(false, 2.0);
 }).mouseover(function () {
 	if (options.src) {

Modified: trunk/mapbender/lib/point.js
===================================================================
--- trunk/mapbender/lib/point.js	2009-09-26 15:32:40 UTC (rev 4721)
+++ trunk/mapbender/lib/point.js	2009-09-26 15:33:14 UTC (rev 4722)
@@ -13,6 +13,13 @@
  * @param {Float} y y value of the {@link Point}
  */
  Mapbender.Point = Point = function (x, y, z){
+	if (typeof x === "object" && x.constructor === Mapbender.Point) {
+		this.x = x.x;
+		this.y = x.y;
+		this.z = x.z;
+		return;
+	}
+
  	/**
  	 * x value of the {@link Point}
  	 *

Modified: trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6_to_2.7rc1_pgsql_UTF-8.sql
===================================================================
--- trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6_to_2.7rc1_pgsql_UTF-8.sql	2009-09-26 15:32:40 UTC (rev 4721)
+++ trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6_to_2.7rc1_pgsql_UTF-8.sql	2009-09-26 15:33:14 UTC (rev 4722)
@@ -326,4 +326,7 @@
 -- background to overview
 UPDATE gui_element set e_more_styles='overflow:hidden;background-color:#ffffff' where e_id='overview'; 
 
+-- file extension is now .js
+UPDATE gui_element SET e_js_file = 'mod_pan.js' WHERE e_id = 'pan1';
+
  
\ No newline at end of file