[Mapbender-commits] r3736 - trunk/mapbender/http/javascripts
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Mon Mar 16 06:28:22 EDT 2009
Author: christoph
Date: 2009-03-16 06:28:21 -0400 (Mon, 16 Mar 2009)
New Revision: 3736
Modified:
trunk/mapbender/http/javascripts/map.php
trunk/mapbender/http/javascripts/map_obj.js
trunk/mapbender/http/javascripts/mod_back.php
trunk/mapbender/http/javascripts/mod_forward.php
trunk/mapbender/http/javascripts/mod_help.php
trunk/mapbender/http/javascripts/mod_legend.php
trunk/mapbender/http/javascripts/mod_scaleHint.php
trunk/mapbender/http/javascripts/mod_scaleSel.php
Log:
changed API of eventBeforeMapRequest and eventAfterMapRequest
trigger parameter is now the map object (called "map") and no longer the frame name ("frameName") of the map.
Modified: trunk/mapbender/http/javascripts/map.php
===================================================================
--- trunk/mapbender/http/javascripts/map.php 2009-03-16 10:00:38 UTC (rev 3735)
+++ trunk/mapbender/http/javascripts/map.php 2009-03-16 10:28:21 UTC (rev 3736)
@@ -168,20 +168,21 @@
$e_height = intval($row_js["e_height"]);
$currentFile = trim($jsArray[$i]);
if (file_exists($currentFile)) {
+ echo "Mapbender.Modules." . $e_id . " = {\n";
+ echo "id:'".$row_js["e_id"]."',";
+ echo "url:'".$row_js["e_url"]."',";
+ echo "top:'".$row_js["e_top"]."',";
+ echo "left:'".$row_js["e_left"]."',";
+ echo "width:'".$row_js["e_width"]."',";
+ echo "height:'".$row_js["e_height"]."'";
if (in_array($e_id, $modulesNotRelyingOnGlobalsArray)) {
- echo "Mapbender.Modules." . $e_id . " = {
- init : function () {\n";
+ echo ",\ninit : function () {\n";
require_once($currentFile);
- echo "},\n";
- echo "id:'".$row_js["e_id"]."',";
- echo "url:'".$row_js["e_url"]."',";
- echo "top:'".$row_js["e_top"]."',";
- echo "left:'".$row_js["e_left"]."',";
- echo "width:'".$row_js["e_width"]."',";
- echo "height:'".$row_js["e_height"]."'";
+ echo "}\n";
echo "};\n";
}
else {
+ echo "};\n";
require_once($currentFile);
}
}
@@ -196,6 +197,9 @@
?>
eventBeforeInit.register(function () {
for (var module in Mapbender.Modules) {
- Mapbender.Modules[module].init();
+ var initFunction = Mapbender.Modules[module].init;
+ if (typeof(initFunction) == "function") {
+ Mapbender.Modules[module].init();
+ }
}
});
Modified: trunk/mapbender/http/javascripts/map_obj.js
===================================================================
--- trunk/mapbender/http/javascripts/map_obj.js 2009-03-16 10:00:38 UTC (rev 3735)
+++ trunk/mapbender/http/javascripts/map_obj.js 2009-03-16 10:28:21 UTC (rev 3736)
@@ -667,7 +667,7 @@
};
this.setSingleMapRequest = function (wms_id) {
- eventBeforeMapRequest.trigger({frameName:this.frameName});
+ eventBeforeMapRequest.trigger({map:this});
var ts = mb_timestamp();
@@ -684,7 +684,7 @@
var myDivId = this.elementName + "_div_" + ii;
writeTag(this.frameName, myDivId, newMapRequest);
var myMapId = this.elementName + "_map_" + ii;
- eventAfterMapRequest.trigger({"frameName":this.elementName, "myMapId":myMapId});
+ eventAfterMapRequest.trigger({"map":this, "myMapId":myMapId});
return true;
}
return false;
@@ -722,7 +722,7 @@
var functionName = 'setMapRequest';
var ret = eventBeforeMapRequest.trigger({
- frameName: this.frameName
+ map: this
}, "AND");
if (ret === false) {
return true;
@@ -746,7 +746,7 @@
writeTag(this.frameName, this.elementName+"_maps", newMapRequest);
eventAfterMapRequest.trigger({
- "frameName": this.elementName,
+ "map": this,
"myMapId": myMapId.join(",")
});
};
Modified: trunk/mapbender/http/javascripts/mod_back.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_back.php 2009-03-16 10:00:38 UTC (rev 3735)
+++ trunk/mapbender/http/javascripts/mod_back.php 2009-03-16 10:28:21 UTC (rev 3736)
@@ -41,8 +41,8 @@
});
eventAfterMapRequest.register(function (obj) {
- mb_setHistoryObj(obj.frameName);
- mod_back_check(obj.frameName);
+ mb_setHistoryObj(obj.map.elementName);
+ mod_back_check(obj.map.elementName);
});
Modified: trunk/mapbender/http/javascripts/mod_forward.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_forward.php 2009-03-16 10:00:38 UTC (rev 3735)
+++ trunk/mapbender/http/javascripts/mod_forward.php 2009-03-16 10:28:21 UTC (rev 3736)
@@ -31,7 +31,7 @@
var mod_forward_img_previous = mod_forward_img_off_disabled.src;
eventAfterMapRequest.register(function (obj) {
- mod_forward_check(obj.frameName);
+ mod_forward_check(obj.map.elementName);
});
$('#<?php echo $e_id;?>').mouseover(function () {
Modified: trunk/mapbender/http/javascripts/mod_help.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_help.php 2009-03-16 10:00:38 UTC (rev 3735)
+++ trunk/mapbender/http/javascripts/mod_help.php 2009-03-16 10:28:21 UTC (rev 3736)
@@ -47,56 +47,61 @@
});
function mod_help_click(){
- //create html tags
- mod_help_set();
- //request help string
- var usemapHtml = "";
- for (var module in Mapbender.Modules) {
- var currentModule = Mapbender.Modules[module];
- var top = parseInt(currentModule.top) || 0;
- var left = parseInt(currentModule.left) || 0;
- var width = parseInt(currentModule.width) || 0;
- var height = parseInt(currentModule.height) || 0;
-
- usemapHtml += "<area id='helpArea_" + module + "' " +
- "shape='rect' coords='" + left + "," +
- top + "," + (parseInt(left + width)) + "," +
- parseInt(top + height) + "' href='#' " +
- "alt='" + ((currentModule.id == mod_help_elName) ? mod_help_text : "HELP: " + currentModule.url) + "' " +
- "title='" + ((currentModule.id == mod_help_elName) ? mod_help_text : "HELP: " + currentModule.url) + "' " +
- "nohref />";
-
- }
-
- var transparentImgHtml = "<img src='../img/transparent.gif' style='cursor:help' " +
- "width='" + mod_help_width + "' height='" + mod_help_height +
- "' usemap='#mod_help_imagemap' border='0'>";
+ //create html tags
+ mod_help_set();
+ //request help string
+ var usemapHtml = "";
+ for (var module in Mapbender.Modules) {
+ var currentModule = Mapbender.Modules[module];
+ var top = parseInt(currentModule.top) || 0;
+ var left = parseInt(currentModule.left) || 0;
+ var width = parseInt(currentModule.width) || 0;
+ var height = parseInt(currentModule.height) || 0;
- var html = "<div id='helpMapContainer'>" + transparentImgHtml + "<map name='mod_help_imagemap'>" + usemapHtml + "</map></div>";
+ if (!currentModule.url) {
+ continue;
+ }
+ usemapHtml += "<area id='helpArea_" + module + "' " +
+ "shape='rect' coords='" + left + "," +
+ top + "," + (parseInt(left + width)) + "," +
+ parseInt(top + height) + "' href='#' " +
+ "alt='" + ((currentModule.id == mod_help_elName) ? mod_help_text : "HELP: " + currentModule.url) + "' " +
+ "title='" + ((currentModule.id == mod_help_elName) ? mod_help_text : "HELP: " + currentModule.url) + "' " +
+ "nohref />";
- $('#mod_help_img').empty().html(html);
+ }
+
+ var transparentImgHtml = "<img src='../img/transparent.gif' style='cursor:help' " +
+ "width='" + mod_help_width + "' height='" + mod_help_height +
+ "' usemap='#mod_help_imagemap' border='0'>";
+
+ var html = "<div id='helpMapContainer'>" + transparentImgHtml + "<map name='mod_help_imagemap'>" + usemapHtml + "</map></div>";
- for (var module in Mapbender.Modules) {
- (function () {
- var currentModule = Mapbender.Modules[module];
+ $('#mod_help_img').empty().html(html);
+
+ for (var module in Mapbender.Modules) {
+ (function () {
+ var currentModule = Mapbender.Modules[module];
+ if (currentModule.url) {
$("#helpArea_" + module).click(function () {
mod_help_disable();
var w = window.open(currentModule.url, "help");
});
- }());
- }
-
- mod_help_set_str();
- return;
-
+ }
+ }());
+ }
+
mod_help_set_str();
+ return;
}
function mod_help_disable(){
- document.getElementById('mod_help_img').innerHTML = '';
- document.getElementById('mod_help_img').style.width = '0px';
- document.getElementById('mod_help_img').style.height = '0px';
- document.getElementById('mod_help_draw').innerHTML = '';
+ $('#mod_help_img').empty().css({
+ width: '0px',
+ height: '0px'
+ });
+ $('#mod_help_draw').empty();
+
mb_disableThisButton(mod_help_elName);
}
function mod_help_set(){
@@ -145,7 +150,7 @@
}
}
catch(e){
- var e = new Mb_exception(e);
+ var e = new Mb_warning(e);
}
}
Modified: trunk/mapbender/http/javascripts/mod_legend.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_legend.php 2009-03-16 10:00:38 UTC (rev 3735)
+++ trunk/mapbender/http/javascripts/mod_legend.php 2009-03-16 10:28:21 UTC (rev 3736)
@@ -79,8 +79,11 @@
stickylegend = 'false';
}
// Todo: return-value may change in the next version....
-parent.mb_registerSubFunctions("window.frames['legend'].mod_legend_pos(frameName)");
+parent.eventAfterMapRequest.register(function (obj) {
+ mod_legend_pos(obj.map.elementName)
+});
+
function mod_legend_init(){
var obj = parent.document.getElementById("legend");
obj.style.top = mod_legend_target_top + mod_legend_offsetTop;
Modified: trunk/mapbender/http/javascripts/mod_scaleHint.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_scaleHint.php 2009-03-16 10:00:38 UTC (rev 3735)
+++ trunk/mapbender/http/javascripts/mod_scaleHint.php 2009-03-16 10:28:21 UTC (rev 3736)
@@ -25,7 +25,10 @@
?>
-mb_registerPreFunctions("mod_scaleHint_init(frameName)");
+eventBeforeMapRequest.register(function (obj) {
+ mod_scaleHint_init(obj.map.elementName);
+});
+
function mod_scaleHint_init(frameName){
if(frameName == mod_scaleHint_target){
var ind = getMapObjIndexByName(frameName);
Modified: trunk/mapbender/http/javascripts/mod_scaleSel.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_scaleSel.php 2009-03-16 10:00:38 UTC (rev 3735)
+++ trunk/mapbender/http/javascripts/mod_scaleSel.php 2009-03-16 10:28:21 UTC (rev 3736)
@@ -21,7 +21,7 @@
echo "var mod_scaleSelect_target = '".$e_target[0]."';";
?>
eventAfterMapRequest.register(function (obj) {
- mod_scaleSelect_val(obj.frameName);
+ mod_scaleSelect_val(obj.map.elementName);
});
function mod_scaleSelect(obj){
var ind = obj.selectedIndex;
More information about the Mapbender_commits
mailing list