some bug fixes and preparing for 6.5.4 bugfix cycle

docs/changelog/6.x.x.txt

@@ -1,3 +1,9 @@
+6.5.4 
+ - fix [ 1160953 ] JavaScript Errors in admin console - IE
+ - Fixed a drag and drop problem.
+ - fix [ 1168195 ] Asset manager: Space between Size and unit
+
+
 6.5.3
  - Sorted templates into folders named after their respective namespaces
    & re-enabled the manage button next to the template dropdown [mwilson]

docs/upgrades/upgrade_6.5.3-6.5.4.pl

@@ -0,0 +1,26 @@
+#!/usr/bin/perl
+
+use lib "../../lib";
+use Getopt::Long;
+use strict;
+use WebGUI::Session;
+use WebGUI::SQL;
+use WebGUI::Asset;
+
+my $configFile;
+my $quiet;
+
+GetOptions(
+    'configFile=s'=>\$configFile,
+	'quiet'=>\$quiet
+);
+
+WebGUI::Session::open("../..",$configFile);
+
+#--------------------------------------------
+print "\tdo something.\n" unless ($quiet);
+
+
+WebGUI::Session::close();
+
+

docs/upgrades/upgrade_6.5.3-6.5.4.sql

@@ -0,0 +1,2 @@
+insert into webguiVersion values ('6.5.4','upgrade',unix_timestamp());
+

lib/WebGUI.pm

@@ -1,5 +1,5 @@
 package WebGUI;
-our $VERSION = "6.5.3";
+our $VERSION = "6.5.4";
 our $STATUS = "beta";
 
 #-------------------------------------------------------------------

lib/WebGUI/Asset/File.pm

@@ -209,7 +209,7 @@ sub processPropertiesFromFormPost {
 		$data{olderVersions} = $oldVersions;
 		$data{title} = $filename unless ($session{form}{title});
 		$data{menuTitle} = $filename unless ($session{form}{menuTitle});
-		$data{url} = $self->getParent->getUrl.'/'.$filename unless ($session{form}{url});
+		$data{url} = $self->getParent->get('url').'/'.$filename unless ($session{form}{url});
 		$self->update(\%data);
 		$self->setSize($storage->getFileSize($filename));
 		$storage->setPrivileges($self->get("ownerUserId"), $self->get("groupIdView"), $self->get("groupIdEdit"));

lib/WebGUI/Utility.pm

@@ -90,11 +90,11 @@ An integer representing the number of bytes to format.
 sub formatBytes {
 	my $size = shift;
         if ($size > 1048576) {
-                return round($size/1048576).'MB';
+                return round($size/1048576).' MB';
         } elsif ($size > 1024) {
-                return round($size/1024).'kB';
+                return round($size/1024).' kB';
         } else {
-		return $size.'B';
+		return $size.' B';
         }
 }
 

www/extras/assetManager/Display.js

@@ -13,7 +13,8 @@ function Display() {
     
     this.focusObjects = new Array();
     this.overObjects = new Array();
-    this.topLevelElement=this.dom? "HTML" : "BODY"
+    //this.topLevelElement=this.dom? "HTML" : "BODY"
+    this.topLevelElement="HTML";
     this.scrollJump = 25;
     this.dragEnabled = false;
     this.dragStart = Display_dragStart;

www/extras/draggable.js

@@ -24,6 +24,7 @@ var contra = "";
 var pageHeight=0;
 var pageWidth=0;
 var scrollJump=50;
+var blankCount=1;
 
 //checks the key Events for copy and paste operations
 //ctrlC ctrlV shiftP shiftY
@@ -371,7 +372,7 @@ function dragable_appendBlankRow(parent) {
     var blank = document.getElementById("blank");
     blank.className="blank";
     blankClone = blank.cloneNode(true);
-    blankClone.id = "blank" + new Date().getTime();
+    blankClone.id = "blank" + new Date().getTime() + blankCount++;
     draggableObjectList[draggableObjectList.length] = blankClone;
     parent.appendChild(blankClone);
     blankClone.style.top=0;