Menu
▾
▴
[Crackerjack-devel-changes] SF.net SVN: crackerjack:[889] trunk/viewsite
|
From: <zn...@us...> - 2009-05-26 09:38:41
|
Revision: 889
http://crackerjack.svn.sourceforge.net/crackerjack/?rev=889&view=rev
Author: znz
Date: 2009-05-26 09:38:28 +0000 (Tue, 26 May 2009)
Log Message:
-----------
use jquery instead of prototype.js
Modified Paths:
--------------
trunk/viewsite/app/views/compare_results/index.html.erb
trunk/viewsite/app/views/layouts/application.html.erb
trunk/viewsite/public/javascripts/application.js
Modified: trunk/viewsite/app/views/compare_results/index.html.erb
===================================================================
--- trunk/viewsite/app/views/compare_results/index.html.erb 2009-05-26 09:37:48 UTC (rev 888)
+++ trunk/viewsite/app/views/compare_results/index.html.erb 2009-05-26 09:38:28 UTC (rev 889)
@@ -11,11 +11,11 @@
<tr>
<th>A</th>
<td><%= collection_select :row, :add, all - @rows, :id, :display_name%></td>
- <td><button onclick="App.addRow($('row_add'))">Add</button></td>
+ <td><button onclick="App.addRow('row_add')">Add</button></td>
<th>B</th>
<td><%= collection_select :col, :add, all - @cols, :id, :display_name%></td>
- <td><button onclick="App.addCol($('col_add'))">Add</button></td>
+ <td><button onclick="App.addCol('col_add')">Add</button></td>
</tr>
</table>
Modified: trunk/viewsite/app/views/layouts/application.html.erb
===================================================================
--- trunk/viewsite/app/views/layouts/application.html.erb 2009-05-26 09:37:48 UTC (rev 888)
+++ trunk/viewsite/app/views/layouts/application.html.erb 2009-05-26 09:38:28 UTC (rev 889)
@@ -22,7 +22,9 @@
<%= link_to "Crackerjack", :controller => "compare_results", :action => "index", :row => '!d', :col => '!d' %>
<%= link_to "[About Page]", :controller => "document", :action => "index_en" %>
- <%= javascript_include_tag :defaults %>
+ <%= javascript_include_tag "jquery-1.3.2.min" %>
+ <%#= javascript_include_tag :defaults %>
+ <%= javascript_include_tag "application" %>
</h2>
<h1><%=h @title %></h1>
Modified: trunk/viewsite/public/javascripts/application.js
===================================================================
--- trunk/viewsite/public/javascripts/application.js 2009-05-26 09:37:48 UTC (rev 888)
+++ trunk/viewsite/public/javascripts/application.js 2009-05-26 09:38:28 UTC (rev 889)
@@ -3,99 +3,58 @@
App = {};
App.removeRow = function(row_id) {
- var row_name = $('row_name_' + row_id).innerHTML.strip();
- $("row_add").insert("<option value='" + row_id+">" + row_name + "</option>");
- var row = $('row_' + row_id);
- row.remove();
+ var row_name = jQuery.trim(jQuery('#row_name_' + row_id).html());
+ jQuery("#row_add").append("<option value='" + row_id+">" + row_name + "</option>");
+ jQuery('#row_' + row_id).remove();
};
App.removeCol = function(col_id) {
- var col_name = $('col_name_' + col_id).innerHTML.strip();
- $("col_add").insert("<option value='" + col_id+">" + col_name + "</option>");
- $$('.col_' + col_id).each(function(e){
- e.remove();
- })
+ var col_name = jQuery.trim(jQuery('#col_name_' + col_id).html());
+ jQuery("#col_add").append("<option value='" + col_id+">" + col_name + "</option>");
+ jQuery('.col_' + col_id).remove();
};
App.getIds = function(css){
- var ids = $$(css).map(function(e){
- return e.id.gsub(/[^0-9]+/, "")
- }).join(".");
- if (ids.empty()) {
+ var ids = [];
+ jQuery(css).each(function(i,e){
+ ids.push(e.id.match(/[0-9]+/g));
+ })
+ if (ids.length == 0) {
return 0;
}
- return ids;
+ return ids.join(".");
};
-App.addRow = function(row_add) {
+App.addRow = function(row_add_id) {
+ var row_add = jQuery("#"+row_add_id)[0];
if (row_add.selectedIndex < 0) return;
var option = row_add.options[row_add.selectedIndex];
var row = option.value;
var col = App.getIds(".col_name");
- var ajaxRequest = new Ajax.Request(
- window.location.pathname,
- {
- method: 'get',
- parameters: {
- col: col,
- row: row
- },
- onComplete: function(originalRequest){
- try {
- var text = originalRequest.responseText;
- App.text = text;
- var matched = text.match('<tr id="row_'+row+'">[\\s\\S]+?</tr>');
- var compare_results = $("compare_results");
- var delete_col_buttons = $("deleteColButtons");
- delete_col_buttons.remove();
- compare_results.insert(matched[0]);
- compare_results.insert(delete_col_buttons);
- option.remove();
- } catch(e) {
- alert(e);
- }
+ jQuery.get(window.location.pathname, { col: col, row: row }, function(text) {
+ try {
+ var matched = text.match('<tr id="row_'+row+'">[\\s\\S]+?</tr>');
+ var delete_col_buttons = jQuery("#deleteColButtons");
+ jQuery(matched[0]).insertBefore(delete_col_buttons);
+ jQuery(option).remove();
+ } catch(e) {
+ alert(e);
}
});
};
-App.addCol = function(col_add) {
+App.addCol = function(col_add_id) {
+ var col_add = jQuery("#"+col_add_id)[0];
if (col_add.selectedIndex < 0) return;
var option = col_add.options[col_add.selectedIndex];
var col = option.value;
var row = App.getIds(".row_name");
- var ajaxRequest = new Ajax.Request(
- window.location.pathname,
- {
- method: 'get',
- parameters: {
- col: col,
- row: row
- },
- onComplete: function(originalRequest){
- try {
- var text = originalRequest.responseText;
- App.text = text;
- var matched = [];
- text.scan('<(t[hd]) class="col_'+col+'[ \"][\\s\\S]+?</\\1>',
- function(e){matched.push(e[0])});
- var compare_results = $("compare_results");
- $A(compare_results.rows).each(function(row, idx){
- var row = $(row);
- var cells = row.cells;
- var last_cell = cells[cells.length-1];
- if (last_cell.className == "delete_row") {
- last_cell.remove();
- } else {
- last_cell = false;
- }
- console.log(row);
- console.log(idx);
- console.log(matched[idx]);
- row.insert(matched[idx]);
- if (last_cell) {
- row.insert(last_cell);
- }
- });
- option.remove();
- } catch(e) {
- alert(e);
- }
+ jQuery.get(window.location.pathname, { col: col, row: row }, function(text) {
+ try {
+ var matched = text.match('<(t[hd]) class="col_'+col+'[ \"][\\s\\S]+?</\\1>', 'g');
+ jQuery("#col_names :last").after(matched.shift());
+ jQuery(".delete_row").each(function(i,e){
+ jQuery(e).before(matched[i]);
+ });
+ jQuery(option).remove();
+ } catch(e) {
+ alert(e);
}
});
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
