diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2008-07-14 21:53:56 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2008-07-14 21:53:56 +0000 |
| commit | 51f10fddb09605ce24df8d5f9281eec62ada8177 (patch) | |
| tree | 5f251d874a579d7a021d9022cf9702b913e789b5 /scripts | |
| parent | 1d8424b5efc7778f66989dc33824a86c61d07b70 (diff) | |
| download | kernel-51f10fddb09605ce24df8d5f9281eec62ada8177.tar.gz kernel-51f10fddb09605ce24df8d5f9281eec62ada8177.tar.bz2 kernel-51f10fddb09605ce24df8d5f9281eec62ada8177.zip | |
removing merge!
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/BitFileBrowser.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/BitFileBrowser.js b/scripts/BitFileBrowser.js index 85e47bf..225c132 100644 --- a/scripts/BitFileBrowser.js +++ b/scripts/BitFileBrowser.js @@ -5,7 +5,7 @@ BitFileBrowser = { "load": function( configName ) {
if( configName ) {
BitBase.showSpinner();
- doSimpleXMLHttpRequest( this.url, merge( {ajax_path_conf:configName} )).addCallback( this.browseCallback, "ajax_load" );
+ doSimpleXMLHttpRequest( this.url, {ajax_path_conf:configName} ).addCallback( this.browseCallback, "ajax_load" );
$( "ajax_load_title" ).innerHTML = '';
}
},
@@ -24,7 +24,7 @@ BitFileBrowser = { if( $( "image-"+relPath )) {
$( "image-"+relPath ).src = BitSystem.urls.iconstyle+"small/folder-open.png";
}
- doSimpleXMLHttpRequest( this.url, merge( {relpath:relPath,ajax_path_conf:configName} )).addCallback( this.browseCallback, relPath+"-bitInsert" );
+ doSimpleXMLHttpRequest( this.url, {relpath:relPath,ajax_path_conf:configName} ).addCallback( this.browseCallback, relPath+"-bitInsert" );
}
}
},
|