diff options
| author | Paul 'flowerysong' Arthur <flowerysong00@yahoo.com> | 2010-06-24 02:52:01 +0000 |
|---|---|---|
| committer | Paul 'flowerysong' Arthur <flowerysong00@yahoo.com> | 2010-06-24 02:52:01 +0000 |
| commit | 62774923211c2e391534d83e6c7d97acae086766 (patch) | |
| tree | a43d0ce9345df18b0f67b61e044636114ce56aba /server | |
| parent | 7549180515107d924610a22c5acf1a0e44b4b9f5 (diff) | |
| download | ampache-62774923211c2e391534d83e6c7d97acae086766.tar.gz ampache-62774923211c2e391534d83e6c7d97acae086766.tar.bz2 ampache-62774923211c2e391534d83e6c7d97acae086766.zip | |
JavaScript cleanup. Consistently use camelCase for naming JS functions. Use
Prototype functionality where possible (particularly for Ajax). Move our JS
into lib/javascript (I dropped kajax as an external module since the new
ajax.js is completely different apart from function headers.) Remove unused
JS functions from base.js.
Diffstat (limited to 'server')
| -rw-r--r-- | server/democratic.ajax.php | 2 | ||||
| -rw-r--r-- | server/stream.ajax.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/server/democratic.ajax.php b/server/democratic.ajax.php index 48fc6fd0..0d345119 100644 --- a/server/democratic.ajax.php +++ b/server/democratic.ajax.php @@ -53,7 +53,7 @@ switch ($_REQUEST['action']) { } $_SESSION['iframe']['target'] = Config::get('web_path') . '/stream.php?action=democratic&democratic_id=' . scrub_out($_REQUEST['democratic_id']); - $results['rfc3514'] = '<script type="text/javascript">reload_util("'.$_SESSION['iframe']['target'].'")</script>'; + $results['rfc3514'] = '<script type="text/javascript">reloadUtil("'.$_SESSION['iframe']['target'].'")</script>'; break; case 'clear_playlist': if (!Access::check('interface','100')) { diff --git a/server/stream.ajax.php b/server/stream.ajax.php index c49d79d4..50923698 100644 --- a/server/stream.ajax.php +++ b/server/stream.ajax.php @@ -84,7 +84,7 @@ switch ($_REQUEST['action']) { // We need to set the basket up! $_SESSION['iframe']['target'] = Config::get('web_path') . '/stream.php?action=basket&playlist_method=' . scrub_out($_REQUEST['playlist_method']); - $results['rfc3514'] = '<script type="text/javascript">reload_util(\''.$_SESSION['iframe']['target'] . '\');</script>'; + $results['rfc3514'] = '<script type="text/javascript">reloadUtil(\''.$_SESSION['iframe']['target'] . '\');</script>'; break; default: $results['rfc3514'] = '0x1'; |