@@ -2,7 +2,7 @@ if(!window.mini)mini={};if(!mini.form)mini.form={};if(!mini.ajax)mini.ajax={}; if(!window.$)$=function(e){if(typeof e=='string')e=document.getElementById(e);return e} function collect(a,f){var n=[];for(var i=0;i<a.length;i++){var v=f(a[i]);if(v!=null)n.push(v)}return n} mini.ajax.bustcache='nocache'; -mini.form.serialize=function(f){var g=function(n){return f.getElementsByTagName(n)};var nv=function(e){if(e.name)return encodeURIComponent(e.name)+'='+encodeURIComponent(e.value);else return null};var i=collect(g('input'),function(i){if((i.type!='radio'&&i.type!='checkbox')||i.checked)return nv(i)});var s=collect(g('select'),nv);var t=collect(g('textarea'),nv);return i.concat(s).concat(t).join('&')} +mini.form.serialize=function(f){var g=function(n){return f.getElementsByTagName(n)};var nv=function(e){if(e.name)return encodeURIComponent(e.name)+'='+encodeURIComponent(e.value)};var i=collect(g('input'),function(i){if((i.type!='radio'&&i.type!='checkbox')||i.checked)return nv(i)});var s=collect(g('select'),nv);var t=collect(g('textarea'),nv);return i.concat(s).concat(t).join('&')} mini.ajax.x=function(){try{return new ActiveXObject('Msxml2.XMLHTTP')}catch(e){try{return new ActiveXObject('Microsoft.XMLHTTP')}catch(e){return new XMLHttpRequest()}}} mini.ajax.send=function(u,f,m,a){var x=mini.ajax.x();if(mini.ajax.bustcache){var c=mini.ajax.bustcache+'='+new Date().getTime();if(m=='GET')u+=u.indexOf('?')==-1?'?':'&'+c;else if(a&&a!='')a+='&'+c;else a=c};x.open(m,u,true);x.onreadystatechange=function(){if(x.readyState==4)f(x.responseText)};if(m=='POST')x.setRequestHeader('Content-type','application/x-www-form-urlencoded');x.send(a)} mini.ajax.get=function(url,func){mini.ajax.send(url,func,'GET')} pkg/ajax.js @@ -27,8 +27,7 @@ mini.form.serialize=function(f){ return f.getElementsByTagName(n) }; var nv=function(e){ - if(e.name)return encodeURIComponent(e.name)+'='+encodeURIComponent(e.value); - else return null + if(e.name)return encodeURIComponent(e.name)+'='+encodeURIComponent(e.value) }; var i=collect( g('input'), src/ajax.js @@ -2,7 +2,7 @@ if(!window.mini)mini={};if(!mini.form)mini.form={};if(!mini.ajax)mini.ajax={}; if(!window.$)$=function(e){if(typeof e=='string')e=document.getElementById(e);return e} function collect(a,f){var n=[];for(var i=0;i<a.length;i++){var v=f(a[i]);if(v!=null)n.push(v)}return n} mini.ajax.bustcache='nocache'; -mini.form.serialize=function(f){var g=function(n){return f.getElementsByTagName(n)};var nv=function(e){if(e.name)return encodeURIComponent(e.name)+'='+encodeURIComponent(e.value);else return null};var i=collect(g('input'),function(i){if((i.type!='radio'&&i.type!='checkbox')||i.checked)return nv(i)});var s=collect(g('select'),nv);var t=collect(g('textarea'),nv);return i.concat(s).concat(t).join('&')} +mini.form.serialize=function(f){var g=function(n){return f.getElementsByTagName(n)};var nv=function(e){if(e.name)return encodeURIComponent(e.name)+'='+encodeURIComponent(e.value)};var i=collect(g('input'),function(i){if((i.type!='radio'&&i.type!='checkbox')||i.checked)return nv(i)});var s=collect(g('select'),nv);var t=collect(g('textarea'),nv);return i.concat(s).concat(t).join('&')} mini.ajax.x=function(){try{return new ActiveXObject('Msxml2.XMLHTTP')}catch(e){try{return new ActiveXObject('Microsoft.XMLHTTP')}catch(e){return new XMLHttpRequest()}}} mini.ajax.send=function(u,f,m,a){var x=mini.ajax.x();if(mini.ajax.bustcache){var c=mini.ajax.bustcache+'='+new Date().getTime();if(m=='GET')u+=u.indexOf('?')==-1?'?':'&'+c;else if(a&&a!='')a+='&'+c;else a=c};x.open(m,u,true);x.onreadystatechange=function(){if(x.readyState==4)f(x.responseText)};if(m=='POST')x.setRequestHeader('Content-type','application/x-www-form-urlencoded');x.send(a)} mini.ajax.get=function(url,func){mini.ajax.send(url,func,'GET')} test/public/js/ajax.js @@ -33,6 +33,7 @@ class AjaxTest < Test::Unit::TestCase assert_no_match /radio_input=value 1/, unescaped assert_match /select_input=value 1/, unescaped assert_no_match /select_input=value 2/, unescaped + assert_no_match /test serialize/, unescaped assert_match /textarea_input=here is some text\s*with\s*a line break or two/, unescaped end test/tests/ajax_test.rb a37869b49dfb7022f8f4d16955d8a48d3714ecf1 Tim Morgan tim@timmorgan.org http://github.com/seven1m/mini/commit/9538f8778780bfac6636ebfc87442676991b56d6 9538f8778780bfac6636ebfc87442676991b56d6 2008-12-21T20:02:38-08:00 2008-12-21T20:02:38-08:00 Clean up ajax.serialize 8aa31aaf4588f1afdd5c63da0d4f0f7a94483e56 Tim Morgan tim@timmorgan.org