[Mapbender-commits] r8141 - in trunk/mapbender: . http/extensions http/extensions/FirePHP-0.3 http/javascripts http/plugins http/print resources/db/pgsql/UTF-8/update

[svn_mapbender at osgeo.org]

Author: kmq
Date: 2011-09-12 05:23:56 -0700 (Mon, 12 Sep 2011)
New Revision: 8141

Modified:
   trunk/mapbender/
   trunk/mapbender/http/extensions/FirePHP-0.3/FirePHP.class.php
   trunk/mapbender/http/extensions/FirePHP-0.3/fb.php
   trunk/mapbender/http/extensions/jqjson.min.js
   trunk/mapbender/http/javascripts/mod_sandclock.js
   trunk/mapbender/http/plugins/mb_selectScale.js
   trunk/mapbender/http/print/A4_portrait_template.json
   trunk/mapbender/http/print/mapbender_template.json
   trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6_pgsql_UTF-8.sql
Log:
merging from branch/2.7


Property changes on: trunk/mapbender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/kmq_dev:4021-4487,7677
   + /branches/2.7:8140
/branches/kmq_dev:4021-4487,7677


Property changes on: trunk/mapbender/http/extensions/FirePHP-0.3/FirePHP.class.php
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/kmq_dev/http/extensions/FirePHP-0.3/FirePHP.class.php:7677
/branches/kmq_dev/http/extensions/FirePHP.class.php:4021-4487
   + /branches/2.7/http/extensions/FirePHP-0.3/FirePHP.class.php:8140
/branches/kmq_dev/http/extensions/FirePHP-0.3/FirePHP.class.php:7677
/branches/kmq_dev/http/extensions/FirePHP.class.php:4021-4487


Property changes on: trunk/mapbender/http/extensions/FirePHP-0.3/fb.php
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/kmq_dev/http/extensions/FirePHP-0.3/fb.php:7677
/branches/kmq_dev/http/extensions/fb.php:4021-4487
   + /branches/2.7/http/extensions/FirePHP-0.3/fb.php:8140
/branches/kmq_dev/http/extensions/FirePHP-0.3/fb.php:7677
/branches/kmq_dev/http/extensions/fb.php:4021-4487


Property changes on: trunk/mapbender/http/extensions/jqjson.min.js
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/kmq_dev/http/extensions/jqjson.min.js:7677
   + /branches/2.7/http/extensions/jqjson.min.js:8140
/branches/kmq_dev/http/extensions/jqjson.min.js:7677


Property changes on: trunk/mapbender/http/javascripts/mod_sandclock.js
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/kmq_dev/http/javascripts/mod_sandclock.js:7677
   + /branches/2.7/http/javascripts/mod_sandclock.js:8140
/branches/kmq_dev/http/javascripts/mod_sandclock.js:7677

Modified: trunk/mapbender/http/plugins/mb_selectScale.js
===================================================================
--- trunk/mapbender/http/plugins/mb_selectScale.js	2011-09-12 12:21:40 UTC (rev 8140)
+++ trunk/mapbender/http/plugins/mb_selectScale.js	2011-09-12 12:23:56 UTC (rev 8141)
@@ -4,9 +4,9 @@
 	var that = this;
 	
 	this.set = function (scale) {
-		options.$target.mapbender(function () {
-			this.repaintScale(null, null, scale);
-		});
+        // IE call this with empty scale for some convoluted reason
+        if(!scale){ return; }
+        options.$target.mapbender().repaintScale(null,null,scale);
 	};
 
 	var init = function () {

Modified: trunk/mapbender/http/print/A4_portrait_template.json
===================================================================
--- trunk/mapbender/http/print/A4_portrait_template.json	2011-09-12 12:21:40 UTC (rev 8140)
+++ trunk/mapbender/http/print/A4_portrait_template.json	2011-09-12 12:23:56 UTC (rev 8141)
@@ -93,6 +93,9 @@
                     "coords_font_family" : "Arial",
                     "coords_font_size" : 8
                 },
+                "permanentImage":{
+                    "type":"permanentImage"
+                },
                 "messung" : {
                     "type" : "measure",
                     "do_fill" : 0,


Property changes on: trunk/mapbender/http/print/mapbender_template.json
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/kmq_dev/http/print/mapbender_template.json:7677
   + /branches/2.7/http/print/mapbender_template.json:8140
/branches/kmq_dev/http/print/mapbender_template.json:7677


Property changes on: trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6_pgsql_UTF-8.sql
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/kmq_dev/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6_pgsql_UTF-8.sql:7677
/branches/kmq_dev/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6rc2_pgsql_UTF-8.sql:4021-4487
   + /branches/2.7/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6_pgsql_UTF-8.sql:8140
/branches/kmq_dev/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6_pgsql_UTF-8.sql:7677
/branches/kmq_dev/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6rc2_pgsql_UTF-8.sql:4021-4487