From ac295210e7b95339f66f7474d5b9d836bfc4ffbe Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Tue, 14 Apr 2015 20:57:46 -0300
Subject: [PATCH] oauth_client: move js to view

---
 plugins/oauth_client/lib/oauth_client_plugin.rb                       |  4 ----
 plugins/oauth_client/public/main.js                                   |  9 ---------
 plugins/oauth_client/views/oauth_client_plugin_public/finish.html.erb | 13 ++++++++++++-
 3 files changed, 12 insertions(+), 14 deletions(-)
 delete mode 100644 plugins/oauth_client/public/main.js

diff --git a/plugins/oauth_client/lib/oauth_client_plugin.rb b/plugins/oauth_client/lib/oauth_client_plugin.rb
index 74a05c7..2b86e62 100644
--- a/plugins/oauth_client/lib/oauth_client_plugin.rb
+++ b/plugins/oauth_client/lib/oauth_client_plugin.rb
@@ -29,10 +29,6 @@ class OauthClientPlugin < Noosfero::Plugin
     end
   end
 
-  def js_files
-    'main.js'
-  end
-
   PROVIDERS = {
     :facebook => {
       :name => 'Facebook'
diff --git a/plugins/oauth_client/public/main.js b/plugins/oauth_client/public/main.js
deleted file mode 100644
index 8971d5a..0000000
--- a/plugins/oauth_client/public/main.js
+++ /dev/null
@@ -1,9 +0,0 @@
-function oauthPluginCloseLoginPopup(loggedIn, privateToken) {
-  if (window.opener && typeof window.opener.oauthPluginHandleLoginResult == 'function') {
-    try {
-      window.opener.oauthPluginHandleLoginResult(loggedIn, privateToken);
-    } catch (err) {}
-    window.close();
-  }
-  return false;
-}
diff --git a/plugins/oauth_client/views/oauth_client_plugin_public/finish.html.erb b/plugins/oauth_client/views/oauth_client_plugin_public/finish.html.erb
index 7d4972a..f534df0 100644
--- a/plugins/oauth_client/views/oauth_client_plugin_public/finish.html.erb
+++ b/plugins/oauth_client/views/oauth_client_plugin_public/finish.html.erb
@@ -1 +1,12 @@
-<script>oauthPluginCloseLoginPopup(<%= logged_in? %>, '<%= private_token %>');</script>
+<script>
+  function oauthPluginCloseLoginPopup(loggedIn, privateToken) {
+    if (window.opener && typeof window.opener.oauthPluginHandleLoginResult == 'function') {
+      try {
+        window.opener.oauthPluginHandleLoginResult(loggedIn, privateToken);
+      } catch (err) {}
+      window.close();
+    }
+    return false;
+  }
+  oauthPluginCloseLoginPopup(<%= logged_in? %>, '<%= private_token %>');
+</script>
--
libgit2 0.21.2