From 27a0c9cac9e6704335acead6aa860ab5c8cefef9 Mon Sep 17 00:00:00 2001
From: Julien Richard-Foy <julien@richard-foy.fr>
Date: Fri, 22 Feb 2013 12:42:27 +0100
Subject: [PATCH] Use requirejs

---
 app/assets/javascripts/anti-flood.js   | 12 +++++++-----
 app/assets/javascripts/chooze.js       |  4 +---
 app/assets/javascripts/locale.js       |  6 ++++--
 app/assets/javascripts/notification.js |  8 +++++---
 app/views/layout.scala.html            |  2 +-
 project/Build.scala                    |  3 ++-
 6 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/anti-flood.js b/app/assets/javascripts/anti-flood.js
index 8145ddc..6dd058f 100644
--- a/app/assets/javascripts/anti-flood.js
+++ b/app/assets/javascripts/anti-flood.js
@@ -1,5 +1,7 @@
-$('form').on('submit', function (e) {
-  $(this).find('input[type=submit], button[type!=button]').each(function () {
-    this.disabled = true
-  })
-})
\ No newline at end of file
+define(function () {
+  $('form').on('submit', function (e) {
+    $(this).find('input[type=submit], button[type!=button]').each(function () {
+      this.disabled = true;
+    })
+  });
+});
\ No newline at end of file
diff --git a/app/assets/javascripts/chooze.js b/app/assets/javascripts/chooze.js
index 0094c6d..18c1676 100644
--- a/app/assets/javascripts/chooze.js
+++ b/app/assets/javascripts/chooze.js
@@ -1,3 +1 @@
-require('notification')
-require('anti-flood')
-require('locale')
\ No newline at end of file
+define(['notification', 'anti-flood', 'locale'], function () { });
\ No newline at end of file
diff --git a/app/assets/javascripts/locale.js b/app/assets/javascripts/locale.js
index 17b2538..2d35f2d 100644
--- a/app/assets/javascripts/locale.js
+++ b/app/assets/javascripts/locale.js
@@ -1,3 +1,5 @@
-$('form.change-locale').change(function () {
-  $(this).submit();
+define(function () {
+  $('form.change-locale').change(function () {
+    $(this).submit();
+  });
 });
diff --git a/app/assets/javascripts/notification.js b/app/assets/javascripts/notification.js
index f4274cc..c9f3e4c 100644
--- a/app/assets/javascripts/notification.js
+++ b/app/assets/javascripts/notification.js
@@ -1,3 +1,5 @@
-$(document).on('click', '.notification .button', function () {
-  $(this).closest('.notification').remove();
-});
+define(function () {
+  $(document).on('click', '.notification .button', function () {
+    $(this).closest('.notification').remove();
+  });
+});
\ No newline at end of file
diff --git a/app/views/layout.scala.html b/app/views/layout.scala.html
index 441b453..789bb65 100644
--- a/app/views/layout.scala.html
+++ b/app/views/layout.scala.html
@@ -35,6 +35,6 @@
           }
         </footer>
 
-        <script src="@routes.Assets.at("javascripts/chooze.min.js")" type="text/javascript"></script>
+        @helper.requireJs(module = routes.Assets.at("javascripts/chooze").url, core = routes.Assets.at("javascripts/require.js").url)
     </body>
 </html>
diff --git a/project/Build.scala b/project/Build.scala
index 90e82d6..ce65c69 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -15,7 +15,8 @@ object ApplicationBuild extends Build {
     )
 
     val main = play.Project(appName, appVersion, appDependencies).settings(
-      scalacOptions += "-feature"
+      scalacOptions += "-feature",
+      requireJs += "chooze.js"
     )
 
 }