From 5067423b8c3eb4993269860c39b492a14e3d66ee Mon Sep 17 00:00:00 2001
From: Carlos Morais <carlos88morais@gmail.com>
Date: Thu, 16 Feb 2012 00:12:30 -0200
Subject: [PATCH] [Mezuro] Refactoring javascripts

---
 plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb |  5 +++++
 plugins/mezuro/lib/mezuro_plugin.rb                            |  2 +-
 plugins/mezuro/public/javascripts/autoreload.js                | 23 -----------------------
 plugins/mezuro/public/javascripts/dynamic.js                   | 38 ++++++++++++++++++++++++++++++++++++++
 plugins/mezuro/public/javascripts/results.js                   | 21 ---------------------
 plugins/mezuro/views/content_viewer/_project_result.rhtml      |  4 ----
 plugins/mezuro/views/content_viewer/show_project.rhtml         |  7 +++++--
 7 files changed, 49 insertions(+), 51 deletions(-)
 delete mode 100644 plugins/mezuro/public/javascripts/autoreload.js
 create mode 100644 plugins/mezuro/public/javascripts/dynamic.js
 delete mode 100644 plugins/mezuro/public/javascripts/results.js

diff --git a/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb b/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
index 413e3c7..b133715 100644
--- a/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
+++ b/plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
@@ -14,4 +14,9 @@ class MezuroPluginProfileController < ProfileController
     render :partial => 'content_viewer/project_result', :locals => { :project_result => project_result }
   end
 
+  def project_state
+    project_content = profile.articles.find(params[:id])
+    project_content.project.state
+  end
+
 end
diff --git a/plugins/mezuro/lib/mezuro_plugin.rb b/plugins/mezuro/lib/mezuro_plugin.rb
index 362a4ea..b09ffe1 100644
--- a/plugins/mezuro/lib/mezuro_plugin.rb
+++ b/plugins/mezuro/lib/mezuro_plugin.rb
@@ -17,7 +17,7 @@ class MezuroPlugin < Noosfero::Plugin
   end
 
   def js_files
-    ['javascripts/autoreload.js', 'javascripts/results.js', 'javascripts/toggle.js']
+    ['javascripts/dynamic.js', 'javascripts/toggle.js']
   end
 
 end
diff --git a/plugins/mezuro/public/javascripts/autoreload.js b/plugins/mezuro/public/javascripts/autoreload.js
deleted file mode 100644
index 89aeb11..0000000
--- a/plugins/mezuro/public/javascripts/autoreload.js
+++ /dev/null
@@ -1,23 +0,0 @@
-function show_autoreload($){
-  var profile = $('#autoreload').attr('data-profile');
-  var project = $('#autoreload').attr('data-project-id');
-  var project_state = $('#autoreload').attr('data-project-state');
-  var project_name = $('#autoreload').attr('data-project-name');
-  var endpoint = '/profile/' + profile + '/plugins/mezuro/autoreload/' + project;
-
-  jQuery('#autoreload').html('Loading results for ...' + project_name); // #FIXME
-  $.get(endpoint, {project_name: project_name}, show_page_with_results);
-  return false;
-}
-
-function show_page_with_results(content){
-  var done = true; // FIXME; test the content in some way
-  if (done) {
-    jQuery('#autoreload').html(content);
-  } else {
-    var wait = 10; // FIXME; how many seconds to wait?
-    setTimeout(function() {
-      show_autoreload(jQuery);
-    }, wait * 1000);
-  }
-}
\ No newline at end of file
diff --git a/plugins/mezuro/public/javascripts/dynamic.js b/plugins/mezuro/public/javascripts/dynamic.js
new file mode 100644
index 0000000..f1efe21
--- /dev/null
+++ b/plugins/mezuro/public/javascripts/dynamic.js
@@ -0,0 +1,38 @@
+function dynamic($) {
+  $('.module-result-link').click(show_module_result);
+}
+
+function endpoint(action){
+  var profile = jQuery('#ids').attr('data-profile');
+  var project = jQuery('#ids').attr('data-content');
+  return '/profile/' + profile + '/plugins/mezuro/' + action + '/' + project;
+}
+
+function show_module_result(){
+  var module_name = jQuery(this).attr('data-module-name');
+  jQuery('#module-result').html("Loading results for " + module_name + "...");
+  jQuery.get(endpoint('module_result'), {module_name: module_name}, show_result_table);
+  return false;
+}
+
+function show_result_table(content){
+  jQuery('#module-result').html(content);
+}
+
+function show_autoreload($){
+  jQuery('#autoreload').html('Loading results for ...' + project_name); // #FIXME
+  jQuery.get(endpoint('project_result'), {project_name: project_name}, show_page_with_results);
+  return false;
+}
+
+function show_page_with_results(content){
+  var done = true; // FIXME; test the content in some way
+  if (done) {
+    jQuery('#autoreload').html(content);
+  } else {
+    var wait = 10; // FIXME; how many seconds to wait?
+    setTimeout(function() {
+      show_autoreload(jQuery);
+    }, wait * 1000);
+  }
+}
\ No newline at end of file
diff --git a/plugins/mezuro/public/javascripts/results.js b/plugins/mezuro/public/javascripts/results.js
deleted file mode 100644
index 11bd921..0000000
--- a/plugins/mezuro/public/javascripts/results.js
+++ /dev/null
@@ -1,21 +0,0 @@
-function results($) {
-  $('.module-result-link').click(show_module_result);
-}
-
-function show_module_result(){
-  var profile = jQuery('#ids').attr('data-profile');
-  var project = jQuery('#ids').attr('data-content');
-  var module_name = jQuery(this).attr('data-module-name');
-  var endpoint = '/profile/' + profile + '/plugins/mezuro/module_result/' + project;
-  show_loading_message(module_name);
-  jQuery.get(endpoint, {module_name: module_name}, show_result_table);
-  return false;
-}
-
-function show_loading_message(module_name) {
-  jQuery('#module-result').html("Loading results for " + module_name + "...");
-}
-
-function show_result_table(content){
-  jQuery('#module-result').html(content);
-}
\ No newline at end of file
diff --git a/plugins/mezuro/views/content_viewer/_project_result.rhtml b/plugins/mezuro/views/content_viewer/_project_result.rhtml
index 1eed89e..e9bf54c 100644
--- a/plugins/mezuro/views/content_viewer/_project_result.rhtml
+++ b/plugins/mezuro/views/content_viewer/_project_result.rhtml
@@ -20,7 +20,3 @@
 
 <div id='module-result'>
 </div>
-
-<script type="text/javascript">
-  jQuery(results);
-</script>
\ No newline at end of file
diff --git a/plugins/mezuro/views/content_viewer/show_project.rhtml b/plugins/mezuro/views/content_viewer/show_project.rhtml
index a901540..96e26ec 100644
--- a/plugins/mezuro/views/content_viewer/show_project.rhtml
+++ b/plugins/mezuro/views/content_viewer/show_project.rhtml
@@ -48,5 +48,8 @@
   <%= render :partial => 'project_result', :locals => { :project_result => @page.project_result } %>
 <% end %>
 
-<div id="ids" data-profile="<%= @page.profile.identifier %>" data-content='<%= @page.id %>'>
-</div>
+<div id="ids" data-profile="<%= @page.profile.identifier %>" data-content='<%= @page.id %>'/>
+
+<script type="text/javascript">
+  jQuery(dynamic);
+</script>
--
libgit2 0.21.2