Update aloha again

coderedhead · Jan 5, 2013 · b349d3b · b349d3b
1 parent ac1fbb8
commit b349d3b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/modules/downloaded/calipso-aloha-master/templates/aloha.script.html b/modules/downloaded/calipso-aloha-master/templates/aloha.script.html
@@ -2,13 +2,11 @@
 <script type = "text/javascript" src = "/lib/aloha.js"></script>
 <!-- markItUp! skin -->
 <script type = "text/javascript">
-
-	jQuery(document).ready(function ($)
+	Aloha.ready(function ()
 	{
-		var $textAreas = $("textarea.textarea");
-		if ($textAreas.length > 0) {
-			$.getScript(["/modules/downloaded/calipso-aloha-master/lib/require.js", "/modules/downloaded/calipso-aloha-master/lib/aloha.js"]);
-			$textAreas.aloha();
-		}
+		var $ = Aloha.jQuery;
+		// Add aloha to your textarea in one line
+		$('textarea.textarea').aloha();
+
 	});
 </script>
diff --git a/modules/downloaded/calipso-aloha-master/templates/aloha.style.html b/modules/downloaded/calipso-aloha-master/templates/aloha.style.html
@@ -1 +1,2 @@
 <link rel="stylesheet" type="text/css" href="css/aloha.css" />
+<link rel="stylesheet" type="text/css" href="/css/aloha(1).css" />
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		<link rel="stylesheet" type="text/css" href="css/aloha.css" />
		<link rel="stylesheet" type="text/css" href="/css/aloha(1).css" />