diff options
| author | Cash Costello <cash.costello@gmail.com> | 2012-06-02 08:41:27 -0700 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2012-06-02 08:41:27 -0700 |
| commit | 28f57861f86f3832150d57e583facc8552ce57eb (patch) | |
| tree | 9ea0f467d72c2a5a802fabf7c969dcfb346429fd | |
| parent | d06b10d5f084aceecdd302036697212a8d8d08e5 (diff) | |
| parent | e5e7238d0f83789217950441aefb4c70e47eac1c (diff) | |
| download | elgg-28f57861f86f3832150d57e583facc8552ce57eb.tar.gz elgg-28f57861f86f3832150d57e583facc8552ce57eb.tar.bz2 | |
Merge pull request #172 from ewinslow/river-externalize-js
Externalizes river JS
| -rw-r--r-- | engine/lib/elgglib.php | 1 | ||||
| -rw-r--r-- | js/lib/ui.river.js | 14 | ||||
| -rw-r--r-- | views/default/core/river/filter.php | 16 |
3 files changed, 17 insertions, 14 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index b55958a6c..3a9230a0a 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -2137,6 +2137,7 @@ function elgg_init() { elgg_register_js('jquery.easing', 'vendors/jquery/jquery.easing.1.3.packed.js'); elgg_register_js('elgg.avatar_cropper', 'js/lib/ui.avatar_cropper.js'); elgg_register_js('jquery.imgareaselect', 'vendors/jquery/jquery.imgareaselect-0.9.8/scripts/jquery.imgareaselect.min.js'); + elgg_register_js('elgg.ui.river', 'js/lib/ui.river.js'); elgg_register_css('jquery.imgareaselect', 'vendors/jquery/jquery.imgareaselect-0.9.8/css/imgareaselect-deprecated.css'); diff --git a/js/lib/ui.river.js b/js/lib/ui.river.js new file mode 100644 index 000000000..a56a664a4 --- /dev/null +++ b/js/lib/ui.river.js @@ -0,0 +1,14 @@ +elgg.provide('elgg.ui.river');
+
+elgg.ui.river.init = function() {
+ $('#elgg-river-selector').change(function() {
+ var url = window.location.href;
+ if (window.location.search.length) {
+ url = url.substring(0, url.indexOf('?'));
+ }
+ url += '?' + $(this).val();
+ elgg.forward(url);
+ });
+};
+
+elgg.register_hook_handler('init', 'system', elgg.ui.river.init);
\ No newline at end of file diff --git a/views/default/core/river/filter.php b/views/default/core/river/filter.php index 87380b561..9b7fadaa8 100644 --- a/views/default/core/river/filter.php +++ b/views/default/core/river/filter.php @@ -34,17 +34,5 @@ if ($selector) { $params['value'] = $selector; } echo elgg_view('input/dropdown', $params); -?> -<?php //@todo JS 1.8: no ?> -<script type="text/javascript"> -elgg.register_hook_handler('init', 'system', function() { - $('#elgg-river-selector').change(function() { - var url = window.location.href; - if (window.location.search.length) { - url = url.substring(0, url.indexOf('?')); - } - url += '?' + $(this).val(); - elgg.forward(url); - }); -}); -</script> + +elgg_load_js('elgg.ui.river'); |