merge r6575-6576 from branch 2.1

-removed use of fix-khtml.css (I tried Safari and it does not need it)
- better javascript funcs + shorter notation

git-svn-id: http://piwigo.org/svn/trunk@6577 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 29 insertions, 43 deletions

diff --git a/themes/default/js/scripts.js b/themes/default/js/scripts.js
index d4595435b..638fccbcf 100644
--- a/themes/default/js/scripts.js
+++ b/themes/default/js/scripts.js
@@ -1,42 +1,30 @@
 function SelectAll( formulaire )
 {
-var len = formulaire.elements.length;
-var i=0;
-for( i = 0; i < len; i++)
+var elts = formulaire.elements;
+for(var i=0; i <elts.length; i++)
 {
-	if ( formulaire.elements[i].type=='checkbox'
-		&& formulaire.elements[i].name != 'copie')
-	{
-		formulaire.elements[i].checked = true;
-	}
+	if (elts[i].type=='checkbox')
+		elts[i].checked = true;
 }
 }
 
 function DeselectAll( formulaire )
 {
-var len = formulaire.elements.length;
-var i=0;
-for( i = 0; i < len; i++)
+var elts = formulaire.elements;
+for(var i=0; i <elts.length; i++)
 {
-	if ( formulaire.elements[i].type=='checkbox'
-		&& formulaire.elements[i].name != 'copie')
-	{
-	formulaire.elements[i].checked = false;
-	}
+	if (elts[i].type=='checkbox')
+		elts[i].checked = false;
 }
 }
 
 function Inverser( formulaire )
 {
-var len = formulaire.elements.length;
-var i=0;
-for( i=0; i<len; i++)
+var elts = formulaire.elements;
+for(var i=0; i <elts.length; i++)
 {
-	if ( formulaire.elements[i].type=='checkbox'
-		&& formulaire.elements[i].name != 'copie')
-	{
-	formulaire.elements[i].checked = !formulaire.elements[i].checked;
-	}
+	if (elts[i].type=='checkbox')
+		elts[i].checked = !elts[i].checked;
 }
 }
 
@@ -46,23 +34,16 @@ function phpWGOpenWindow(theURL,winName,features)
 	img.src = theURL;
 	if (img.complete)
 	{
-		var width=img.width +40;
-		var height=img.height +40;
+		var width=img.width+40, height=img.height+40;
 	}
 	else
 	{
-		var width=640;
-		var height=480;
-		img.onload = resizeWindowToFit;
+		var width=640, height=480;
+		img.onload = function () { newWin.resizeTo( img.width+50, img.height+100); };
 	}
 	newWin = window.open(theURL,winName,features+',left=2,top=1,width=' + width + ',height=' + height);
 }
 
-function resizeWindowToFit()
-{
-	newWin.resizeTo( img.width+50, img.height+100);
-}
-
 function popuphelp(url)
 {
 	window.open( url, 'dc_popup',
@@ -70,15 +51,12 @@ function popuphelp(url)
 	);
 }
 
-
-
 Function.prototype.pwgBind = function() {
-	var __method = this, object = arguments[0], args = new Array();
-	for (var i=1; i<arguments.length; i++)
-		args[i-1] = arguments[i];
-	return function() { return __method.apply(object, args); }
+		var __method = this, object = arguments[0], args = Array.prototype.slice.call(arguments,1);
+		return function() {
+				return __method.apply(object, args.concat(arguments) );
+		}
 }
-
 function PwgWS(urlRoot)
 {
 	this.urlRoot = urlRoot;
@@ -144,8 +122,8 @@ PwgWS.prototype = {
 
 	onStateChange: function() {
 		var readyState = this.transport.readyState;
-		if (readyState == 4)
-			this.respondToReadyState(this.transport.readyState);
+		if (readyState==4)
+			this.respondToReadyState(readyState);
 	},
 
 	dispatchError: function( httpCode, text )
@@ -186,3 +164,11 @@ PwgWS.prototype = {
 	urlRoot: null,
 	options: {}
 }
+
+function pwgAddEventListener(elem, evt, fn)
+{
+	if (window.attachEvent)
+		elem.attachEvent('on'+evt, fn);
+	else
+		elem.addEventListener(evt, fn, false);
+}
\ No newline at end of file