diff options
| author | Kate Arzamastseva <pshns@ukr.net> | 2011-06-28 15:54:18 +0300 |
|---|---|---|
| committer | Kate Arzamastseva <pshns@ukr.net> | 2011-06-28 15:54:18 +0300 |
| commit | e18ba5797b635bf97755910093c3eed1f9667362 (patch) | |
| tree | cf6fd41758cf814d96222d74a37def8787f888be /lib/scripts | |
| parent | 322111f0870d88a59b71258ce8410ae378441533 (diff) | |
| parent | a4f16859d7e91bb129edd3be5c62177d56030981 (diff) | |
| download | rpg-e18ba5797b635bf97755910093c3eed1f9667362.tar.gz rpg-e18ba5797b635bf97755910093c3eed1f9667362.tar.bz2 | |
Merge branch 'master' of git://github.com/splitbrain/dokuwiki into media-revisions
Diffstat (limited to 'lib/scripts')
| -rw-r--r-- | lib/scripts/behaviour.js | 7 | ||||
| -rw-r--r-- | lib/scripts/media.js | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/lib/scripts/behaviour.js b/lib/scripts/behaviour.js index 62c20eb0f..7cc65579e 100644 --- a/lib/scripts/behaviour.js +++ b/lib/scripts/behaviour.js @@ -8,7 +8,6 @@ * automatically whenever a certain object is in the DOM or a certain CSS * class was found */ - var dw_behaviour = { init: function(){ @@ -24,9 +23,9 @@ var dw_behaviour = { * Looks for an element with the ID scroll__here at scrolls to it */ scrollToMarker: function(){ - var obj = jQuery('#scroll__here'); - if(obj.length) { - obj[0].scrollIntoView(); + var $obj = jQuery('#scroll__here'); + if($obj.length) { + $obj[0].scrollIntoView(); } }, diff --git a/lib/scripts/media.js b/lib/scripts/media.js index bcdba2a48..ebbee5a78 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -303,7 +303,7 @@ $.post( DOKU_BASE + 'lib/exe/ajax.php', - link.attr('search').substr(1) + '&call=medians', + link[0].search.substr(1) + '&call=medians', function (data) { ul.html(data); listitem.append(ul); @@ -326,7 +326,7 @@ event.preventDefault(); - jQuery.remove('div.success, div.info, div.error, div.notify'); + jQuery('div.success, div.info, div.error, div.notify').remove(); content = $('#media__content'); content.html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />'); @@ -334,7 +334,7 @@ // fetch the subtree $.post( DOKU_BASE + 'lib/exe/ajax.php', - link.attr('search').substr(1)+'&call=medialist', + link[0].search.substr(1)+'&call=medialist', function (data) { content.html(data); prepare_content(content); |