web/common.php
changeset 259 bc17d1af15ab
parent 258 58bd8e4d5e65
child 266 bb7a2f8202b9
--- a/web/common.php	Fri Aug 19 17:53:30 2011 +0200
+++ b/web/common.php	Sun Aug 28 11:48:30 2011 +0200
@@ -105,43 +105,47 @@
 
 $js_registry = array(
 	'local' => array(
-	    'jquery' => URL_ROOT.'res/js/jquery-1.4.3.min.js',
-	    'raphael' => URL_ROOT.'res/raphael/raphael-min.js',
-	    'jquery-ui' => URL_ROOT.'res/js/jquery-ui-1.8.13.min.js',
-	    'niceforms' => URL_ROOT.'res/niceforms/niceforms.js',
-	    'jquery-url' => URL_ROOT.'res/js/jquery.url.js',
-	    'ldtplayer' => URL_ROOT.'res/metadataplayer/src/js/LdtPlayer.js',
-		'fancybox' => URL_ROOT.'res/jquery.fancybox/fancybox/jquery.fancybox-1.3.4.pack.js',
-		'jquery-tools' => URL_ROOT.'res/metadataplayer/res/js/jquery.tools.min.js',
-		'tw-widget' => URL_ROOT.'res/js/tw_widget.js',
+	    'jquery' 		=> URL_ROOT.'res/js/jquery-1.4.3.min.js',
+	    'raphael' 		=> URL_ROOT.'res/raphael/raphael-min.js',
+	    'jquery-ui' 	=> URL_ROOT.'res/js/jquery-ui-1.8.13.min.js',
+	    'niceforms' 	=> URL_ROOT.'res/niceforms/niceforms.js',
+	    'jquery-url' 	=> URL_ROOT.'res/js/jquery.url.js',
+	    'ldtplayer' 	=> URL_ROOT.'res/metadataplayer/src/js/LdtPlayer.js',
+		'fancybox' 		=> URL_ROOT.'res/jquery.fancybox/fancybox/jquery.fancybox-1.3.4.pack.js',
+		'jquery-tools' 	=> URL_ROOT.'res/metadataplayer/res/js/jquery.tools.min.js',
+		'tw-widget' 	=> URL_ROOT.'res/js/tw_widget.js',
 		'jquery-mousewheel' => URL_ROOT.'res/jquery.fancybox/fancybox/jquery.mousewheel-3.0.4.pack.js',
-		'swfobject' => URL_ROOT.'res/metadataplayer/res/js/swfobject.js',
+		'swfobject' 	=> URL_ROOT.'res/metadataplayer/res/js/swfobject.js',
+		'json-js' 		=> URL_ROOT.'res/douglascrockford-JSON-js/json2.js',
+
 	),
 	'cdn' => array(
-	    'jquery' => 'http://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js',
-		'raphael' => URL_ROOT.'res/raphael/raphael-min.js',
-		'jquery-ui' => 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js',
-		'niceforms' => URL_ROOT.'res/niceforms/niceforms.js',
-		'jquery-url' => URL_ROOT.'res/js/jquery.url.js',
-		'ldtplayer' => URL_ROOT.'res/metadataplayer/src/js/LdtPlayer.js',
-		'fancybox' => URL_ROOT.'res/jquery.fancybox/fancybox/jquery.fancybox-1.3.4.pack.js',
-		'jquery-tools' => 'http://cdn.jquerytools.org/1.2.4/all/jquery.tools.min.js',
-		'tw-widget' => 'http://widgets.twimg.com/j/2/widget.js',
+	    'jquery' 		=> 'http://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js',
+		'raphael' 		=> URL_ROOT.'res/raphael/raphael-min.js',
+		'jquery-ui' 	=> 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js',
+		'niceforms' 	=> URL_ROOT.'res/niceforms/niceforms.js',
+		'jquery-url' 	=> URL_ROOT.'res/js/jquery.url.js',
+		'ldtplayer' 	=> URL_ROOT.'res/metadataplayer/src/js/LdtPlayer.js',
+		'fancybox' 		=> URL_ROOT.'res/jquery.fancybox/fancybox/jquery.fancybox-1.3.4.pack.js',
+		'jquery-tools' 	=> 'http://cdn.jquerytools.org/1.2.4/all/jquery.tools.min.js',
+		'tw-widget' 	=> 'http://widgets.twimg.com/j/2/widget.js',
 		'jquery-mousewheel' => URL_ROOT.'res/jquery.fancybox/fancybox/jquery.mousewheel-3.0.4.pack.js',
-		'swfobject' => 'http://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js',
+		'swfobject' 	=> 'http://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js',
+		'json-js' 		=> URL_ROOT.'res/douglascrockford-JSON-js/json2.js',
+		
 	)
 );
 
 $font_registry = array(
 	'local' => array(
 		'PT-Sans_Narrow' => URL_ROOT.'res/fonts/PT_Sans-Narrow-Web-Regular.css',
-		'PT-Sans' => URL_ROOT.'res/fonts/PT_Sans-Web-Regular.css',
-		'Geo' => URL_ROOT.'res/fonts/Geo-Regular.css'
+		'PT-Sans' 		 => URL_ROOT.'res/fonts/PT_Sans-Web-Regular.css',
+		'Geo' 			 => URL_ROOT.'res/fonts/Geo-Regular.css'
 	),
 	'cdn' => array(
 		'PT-Sans_Narrow' => 'http://fonts.googleapis.com/css?family=PT+Sans+Narrow&subset=latin',
-		'PT-Sans' => 'http://fonts.googleapis.com/css?family=PT+Sans&subset=latin',
-		'Geo' => 'http://fonts.googleapis.com/css?family=Geo&subset=latin'
+		'PT-Sans' 		 => 'http://fonts.googleapis.com/css?family=PT+Sans&subset=latin',
+		'Geo' 			 => 'http://fonts.googleapis.com/css?family=Geo&subset=latin'
 	)
 );