From d4cab20408bcfa394ca978a16e09e6fd84539350 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 12 Mar 2011 20:08:44 +0000
Subject: Refs #3091 rewrote the js and css register functions to require a
 name

git-svn-id: http://code.elgg.org/elgg/trunk@8668 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/blog/lib/blog.php                                                 | 4 ++--
 mod/notifications/index.php                                           | 2 +-
 .../views/default/notifications/subscriptions/forminternals.php       | 4 ++--
 mod/pages/start.php                                                   | 4 ++--
 mod/tinymce/views/default/tinymce/init.php                            | 4 ++--
 mod/zaudio/views/default/zaudio/audioplayer.php                       | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'mod')

diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index 81d06ca0a..94ab65da1 100644
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -299,7 +299,7 @@ function blog_get_page_content_edit($page, $guid = 0, $revision = NULL) {
 			elgg_push_breadcrumb(elgg_echo('edit'));
 			
 			$blog_js = elgg_get_simplecache_url('js', 'blog/save_draft');
-			elgg_register_js($blog_js, 'blog');
+			elgg_register_js('elgg.blog', $blog_js);
 
 			$content = elgg_view_form('blog/save', $vars, $body_vars);
 			$sidebar = elgg_view('blog/sidebar/revisions', $vars);
@@ -320,7 +320,7 @@ function blog_get_page_content_edit($page, $guid = 0, $revision = NULL) {
 		$content = elgg_view_form('blog/save', $vars, $body_vars);
 		
 		$blog_js = elgg_get_simplecache_url('js', 'blog/save_draft');
-		elgg_register_js($blog_js, 'blog');
+		elgg_register_js('elgg.blog', $blog_js);
 	}
 
 	$return['title'] = $title;
diff --git a/mod/notifications/index.php b/mod/notifications/index.php
index f970dfc32..30ee1b74b 100644
--- a/mod/notifications/index.php
+++ b/mod/notifications/index.php
@@ -14,7 +14,7 @@ gatekeeper();
 set_page_owner(elgg_get_logged_in_user_guid());
 
 $js_url = elgg_get_simplecache_url('js', 'friendsPickerv1');
-elgg_register_js($js_url, 'friendsPicker');
+elgg_register_js('friendsPicker', $js_url);
 
 // Set the context to settings
 elgg_set_context('settings');
diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
index 936194842..fac8c083c 100644
--- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php
+++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
@@ -3,8 +3,8 @@
  * Hacked up friends picker that needs to be replaced
  */
 
-elgg_register_js('js/lib/friends_picker.js', 'friendspicker', 'head');
-elgg_register_js('vendors/jquery/jquery.easing.1.3.packed.js', 'jquery.easing');
+elgg_register_js('elgg.friendspicker', 'js/lib/friends_picker.js');
+elgg_register_js('jquery.easing', 'vendors/jquery/jquery.easing.1.3.packed.js');
 
 ?>
 <div class="elgg-module elgg-module-info">
diff --git a/mod/pages/start.php b/mod/pages/start.php
index 1c655bd07..23c564da5 100644
--- a/mod/pages/start.php
+++ b/mod/pages/start.php
@@ -101,9 +101,9 @@ function pages_page_handler($page) {
 	
 	// add the jquery treeview files for navigation
 	$js_url = elgg_get_site_url() . 'mod/pages/vendors/jquery-treeview/jquery.treeview.min.js';
-	elgg_register_js($js_url, 'jquery-treeview');
+	elgg_register_js('jquery-treeview', $js_url);
 	$css_url = elgg_get_site_url() . 'mod/pages/vendors/jquery-treeview/jquery.treeview.css';
-	elgg_register_css($css_url, 'jquery-treeview');
+	elgg_register_css('jquery-treeview', $css_url);
 
 	if (!isset($page[0])) {
 		$page[0] = 'all';
diff --git a/mod/tinymce/views/default/tinymce/init.php b/mod/tinymce/views/default/tinymce/init.php
index 408aba094..3fe08771c 100644
--- a/mod/tinymce/views/default/tinymce/init.php
+++ b/mod/tinymce/views/default/tinymce/init.php
@@ -3,5 +3,5 @@
  * Initialize the TinyMCE script
  */
 
-elgg_register_js('mod/tinymce/vendor/tinymce/jscripts/tiny_mce/tiny_mce.js', 'tinymce');
-elgg_register_js(elgg_get_simplecache_url('js', 'tinymce'), 'elgg.tinymce');
\ No newline at end of file
+elgg_register_js('tinymce', 'mod/tinymce/vendor/tinymce/jscripts/tiny_mce/tiny_mce.js');
+elgg_register_js('elgg.tinymce', elgg_get_simplecache_url('js', 'tinymce'));
\ No newline at end of file
diff --git a/mod/zaudio/views/default/zaudio/audioplayer.php b/mod/zaudio/views/default/zaudio/audioplayer.php
index 2708f4cec..6898506a6 100644
--- a/mod/zaudio/views/default/zaudio/audioplayer.php
+++ b/mod/zaudio/views/default/zaudio/audioplayer.php
@@ -5,7 +5,7 @@
  */
 
 $js_url = elgg_get_site_url() . 'mod/zaudio/audioplayer/audio-player.js';
-elgg_register_js($js_url, 'zaudio');
+elgg_register_js('elgg.zaudio', $js_url);
 
 $swf_url = elgg_get_site_url() . 'mod/zaudio/audioplayer/player.swf';
 $mp3_url = elgg_get_site_url() . "mod/file/download.php?file_guid={$vars['file_guid']}";
-- 
cgit v1.2.3