Merge branch 'refs/heads/development'

AccessAtECS · Feb 7, 2012 · 595ad7d · 595ad7d
2 parents 7716e8d + 098e562
commit 595ad7d
Showing 1 changed file with 19 additions and 15 deletions.
diff --git a/ATBar.user.js b/ATBar.user.js
@@ -1,6 +1,7 @@
 if(typeof window['AtKit'] == "undefined"){
 	// Load AtKit
-	d=document;jf=d.createElement('script');jf.src='http://c.atbar.org/atkit/AtKit.js';jf.type='text/javascript';jf.id='AtKitLib';d.getElementsByTagName('head')[0].appendChild(jf);
+
+	d=document;jf=d.createElement('script');jf.src=('https:' == document.location.protocol ? 'https://ssl.atbar.org/c' : 'http://c.atbar.org') + '/atkit/AtKit.min.js';jf.type='text/javascript';jf.id='AtKitLib';d.getElementsByTagName('head')[0].appendChild(jf);
 
 	window.AtKitLoaded = function(){
 		var eventAction = null;
@@ -27,45 +28,48 @@ function __start(){
 	// Start toolbar code
 	(function (window, AtKit) { 
 
-		$ = AtKit.lib();
+		$lib = AtKit.lib();
 
 		var settings = {
-			'baseURL': 'http://c.atbar.org/ATBar/',
-			'version': '2.0.070d'
+			'version': '2.0.101-beta6'
 		};
 
+		settings.baseURL = ('https:' == document.location.protocol ? 'https://ssl.atbar.org/c/ATBar2/' : 'http://c.atbar.org/ATBar2/');
+
+		var plugins = ["resize", "fonts", "spell", "dictionary", "insipio-tts", "readability", "css", "shortcutkeys", "tooltip"];
+
 		var onLoad = function(){
 
 			// Set our logo
 			AtKit.setLogo(settings.baseURL + "images/atbar.png");
 			AtKit.setName("ATBar");
-			// Set language to Arabic
+
 			AtKit.setLanguage("ar");
 
 			var about = "Version " + settings.version;
-			about += "<p style=\"line-height:120%\">Created by <a href=\"http://ecs.soton.ac.uk/people/scs/\">Sebastian Skuse</a> and the <a href=\"http://access.ecs.soton.ac.uk/\">Accessibility Team</a>.<br>Learning Societies Lab, ECS<br> &copy; University of Southampton 2012.<br><br>Fugue Icons &copy; <a href=\"http://www.pinvoke.com/\">pinvoke</a> under Creative Commons licence, Dictionary &copy; <a href=\"http://en.wiktionary.org/\">Wiktionary</a> under Creative Commons licence.<br><a href=\"http://famspam.com/facebox/\">Facebox</a> jQuery plugin &copy; Chris Wanstrath under MIT licence, Portions of the spelling engine &copy; <a href=\"http://brandonaaron.net\">Brandon Aaron</a> under MIT licence.</p>";
+			about += "<p style=\"line-height:120%\">Created by <a href=\"http://seb.skus.es/\">Sebastian Skuse</a> and the <a href=\"http://access.ecs.soton.ac.uk/\">Accessibility Team</a>.<br>Web and Internet Science, ECS<br> &copy; University of Southampton 2011.<br><br>Fugue Icons &copy; <a href=\"http://www.pinvoke.com/\">pinvoke</a> under Creative Commons licence, Dictionary &copy; <a href=\"http://en.wiktionary.org/\">Wiktionary</a> under Creative Commons licence.<br><a href=\"http://famspam.com/facebox/\">Facebox</a> jQuery plugin &copy; Chris Wanstrath under MIT licence, Portions of the spelling engine &copy; <a href=\"http://brandonaaron.net\">Brandon Aaron</a> under MIT licence.</p>";
 
 			AtKit.setAbout(about);
 
 			// Add all the plugins to the toolbar
-			AtKit.addPlugin("ftw");	
-			AtKit.addPlugin("resize");
-			AtKit.addPlugin("fonts");	
-			AtKit.addPlugin("spell");
-			AtKit.addPlugin("dictionary");
-			AtKit.addPlugin("gtts");
-			AtKit.addPlugin("css");
+
+			$lib.each(plugins, function(i, v){
+				AtKit.addPlugin(v);
+			});
 
 			AtKit.addResetFn('reset-saved', function(){
 				AtKit.clearStorage();
-			});
+			});	
 
 			// Run
 			AtKit.render();
+
+			// Select the first button.
+			$lib('.at-btn:first a').focus();
 		};
 
 
-		AtKit.importPlugins(["ftw", "resize", "fonts", "spell", "dictionary", "gtts", "css"], onLoad);
+		AtKit.importPlugins(plugins, onLoad);
 
 
 	}(window, AtKit));