diff --git a/CREDITS b/CREDITS index ee3409e9..33a2ccfc 100644 --- a/CREDITS +++ b/CREDITS @@ -3,6 +3,12 @@ javascript date selection Mihai Bazon http://dynarch.com adapted to Rails by Gaspard Bucher + +tablekit table editor +--------------------- + Andrew Tetlaw & Millstream Web Software + http://www.millstream.com.au/view/code/tablekit/ + add/remove columns and drag&drop support added by Gaspard Bucher soft icons ---------- @@ -11,8 +17,8 @@ soft icons xspf mp3 player --------------- - Fabricio Zuardi - http://musicplayer.sourceforge.net/ + Fabricio Zuardi + http://musicplayer.sourceforge.net/ upload progress bar (sample application demo) ------------------- diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 5854eda1..c34ecb21 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,5 +1,6 @@ require 'digest/sha1' require 'tempfile' +require 'json' # Methods added to this helper will be available to all templates in the application. module ApplicationHelper @@ -544,6 +545,40 @@ def make_gallery(ids=[], opts={}) render_to_string( :partial=>'nodes/gallery', :locals=>{:gallery=>images} ) end + + # Create a table from an attribute + def make_table(opts) + style, node, attribute, title, images, table = opts[:style], opts[:node], opts[:attribute], opts[:title], opts[:images], opts[:table] + case style.sub('.', '') + when ">" + prefix = "
+<% table[1][0].each do |heading| -%> + | <%= heading %> | +<% end -%> + +<% table[1][1..-1].each do |row| -%> +
---|
<%= td %> | +<% end -%> +
and @@ instead of "extract"
flush
@@ -314,6 +316,53 @@ def scan_wiki_link
end
end
+ def scan_pipe
+ #puts "PIPE:[#{@text}]"
+ if @text =~ /\A\|([<=>]\.|)([0-9]+\.|)([a-zA-Z_]+)(\/([^\|]*)|)\|/m
+ # table |<.34.shopping_list/blah blah|
+ # table |shopping_list|
+ #puts "TABLE:#{$~.to_a.inspect}"
+ eat $&
+ style, id, attribute, title_opts, title = $1, $2, $3, $4, $5
+ id = id[0..-2] if id != ''
+ if @translate_ids
+ if @translate_ids != :zip
+ node = @helper.find_node_by_pseudo(id, @context[:node])
+ id = node.pseudo_id(@context[:node], @translate_ids) if node
+ end
+ store "|#{style}#{id}.#{attribute}#{title}|"
+ else
+ node = id == '' ? @context[:node] : @helper.find_node_by_pseudo(id, @context[:node])
+ store @helper.make_table(:style=>style, :node=>node, :attribute=>attribute, :title=>title)
+ end
+ elsif @text =~ /\A\|([<=>]\.|)(#{PSEUDO_ID_REGEXP})\.([a-zA-Z_]+)(\/([^\|]*)|)\|/m
+ # table |<.:art++.shopping_list/blah blah|
+ # table |shopping_list|
+ #puts "TABLE SHORTCUT:#{$~.to_a.inspect}"
+ eat $&
+ text = $&
+ style, id, attribute, title_opts, title = $1, $2, $3, $4, $5
+ if node = @helper.find_node_by_pseudo(id, @context[:node])
+ if @translate_ids
+ # replace shortcut
+ store "|#{style}#{node.pseudo_id(@context[:node], @translate_ids || :zip)}.#{attribute}#{title}|"
+ else
+ # write table
+ store @helper.make_table(:style=>style, :node=>node, :attribute=>attribute, :title=>title)
+ end
+ elsif @translate_ids
+ # node not found, ignore
+ store text
+ else
+ # node not found
+ store "[#{id} not found]"
+ end
+ else
+ #puts "EAT:[#{$&}]"
+ # eat marker and continue scan
+ flush @text[0..0]
+ end
+ end
def extract_code(fulltext)
@escaped_code = []
diff --git a/lib/parser/test/parser/zazen.yml b/lib/parser/test/parser/zazen.yml
index 46ca0ba6..842df029 100755
--- a/lib/parser/test/parser/zazen.yml
+++ b/lib/parser/test/parser/zazen.yml
@@ -116,6 +116,26 @@ image_with_http_link:
image_with_ref:
src: "!http://www.example.org/images/test.jpg!"
res: ""
+
+table:
+ src: "|shopping_list|"
+ res: "[make_table attribute:|shopping_list| style:||]
"
+
+table_title:
+ src: "|shopping_list/A list of frequent problems|"
+ res: "[make_table attribute:|shopping_list| style:|| title:|A list of frequent problems|]
"
+
+table_id:
+ src: "|34.shopping_list|"
+ res: "[make_table attribute:|shopping_list| node:|34| style:||]
"
+
+table_pseudo_id:
+ src: "|:art+.shopping_list|"
+ res: "[make_table attribute:|shopping_list| node:|:art+| style:||]
"
+
+table_pseudo_path:
+ src: "|(../some/path).shopping_list|"
+ res: "[make_table attribute:|shopping_list| node:|(../some/path)| style:||]
"
link_with_title:
src: '"this is a title":23'
diff --git a/lib/parser/test/parser_test.rb b/lib/parser/test/parser_test.rb
index a528f525..66906024 100755
--- a/lib/parser/test/parser_test.rb
+++ b/lib/parser/test/parser_test.rb
@@ -15,7 +15,7 @@ def blank?
class ParserModule::DummyHelper
def find_node_by_pseudo(*args)
- nil
+ args[0]
end
end
@@ -74,6 +74,12 @@ def r_test
end
end
+class String
+ def pseudo_id(*args)
+ self
+ end
+end
+
class ParserTest < Test::Unit::TestCase
yaml_test :zafu => {}, :zafu_asset => {}, :zafu_insight => {}, :zazen => {} #, :latex => {:module => :zazen, :output => 'latex'}
@@test_parsers = {}
diff --git a/public/javascripts/tablekit.js b/public/javascripts/tablekit.js
new file mode 100755
index 00000000..1eeb397f
--- /dev/null
+++ b/public/javascripts/tablekit.js
@@ -0,0 +1,938 @@
+/*
+*
+* Copyright (c) 2007 Andrew Tetlaw & Millstream Web Software
+* http://www.millstream.com.au/view/code/tablekit/
+* Version: 1.3b 2008-03-23
+*
+* Permission is hereby granted, free of charge, to any person
+* obtaining a copy of this software and associated documentation
+* files (the "Software"), to deal in the Software without
+* restriction, including without limitation the rights to use, copy,
+* modify, merge, publish, distribute, sublicense, and/or sell copies
+* of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be
+* included in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+* SOFTWARE.
+* *
+*/
+
+// Use the TableKit class constructure if you'd prefer to init your tables as JS objects
+var TableKit = Class.create();
+
+TableKit.prototype = {
+ initialize : function(elm, options) {
+ var table = $(elm);
+ if(table.tagName !== "TABLE") {
+ return;
+ }
+ TableKit.register(table,Object.extend(TableKit.options,options || {}));
+ this.id = table.id;
+ var op = TableKit.option('sortable resizable editable', this.id);
+ if(op.sortable) {
+ TableKit.Sortable.init(table);
+ }
+ if(op.resizable) {
+ TableKit.Resizable.init(table);
+ }
+ if(op.editable) {
+ TableKit.Editable.init(table);
+ }
+ },
+ sort : function(column, order) {
+ TableKit.Sortable.sort(this.id, column, order);
+ },
+ resizeColumn : function(column, w) {
+ TableKit.Resizable.resize(this.id, column, w);
+ },
+ editCell : function(row, column) {
+ TableKit.Editable.editCell(this.id, row, column);
+ }
+};
+
+Object.extend(TableKit, {
+ getBodyRows : function(table) {
+ table = $(table);
+ var id = table.id;
+ if(!TableKit.tables[id].dom.rows) {
+ TableKit.tables[id].dom.rows = (table.tHead && table.tHead.rows.length > 0) ? $A(table.tBodies[0].rows) : $A(table.rows).without(table.rows[0]);
+ }
+ return TableKit.tables[id].dom.rows;
+ },
+ getHeaderCells : function(table, cell) {
+ if(!table) { table = $(cell).up('table'); }
+ var id = table.id;
+ if(!TableKit.tables[id].dom.head) {
+ TableKit.tables[id].dom.head = $A((table.tHead && table.tHead.rows.length > 0) ? table.tHead.rows[table.tHead.rows.length-1].cells : table.rows[0].cells);
+ }
+ return TableKit.tables[id].dom.head;
+ },
+ getCellIndex : function(cell) {
+ return $A(cell.parentNode.cells).indexOf(cell);
+ },
+ getRowIndex : function(row) {
+ return $A(row.parentNode.rows).indexOf(row);
+ },
+ getCellText : function(cell, refresh) {
+ if(!cell) { return ""; }
+ var data = TableKit.getCellData(cell);
+ if(refresh || data.refresh || !data.textContent) {
+ data.textContent = cell.textContent ? cell.textContent : cell.innerText;
+ data.refresh = false;
+ }
+ return data.textContent;
+ },
+ getCellData : function(cell) {
+ var t = null;
+ if(!cell.id) {
+ t = $(cell).up('table');
+ cell.id = t.id + "-cell-" + TableKit._getc();
+ }
+ var tblid = t ? t.id : cell.id.match(/(.*)-cell.*/)[1];
+ if(!TableKit.tables[tblid].dom.cells[cell.id]) {
+ TableKit.tables[tblid].dom.cells[cell.id] = {textContent : '', htmlContent : '', active : false};
+ }
+ return TableKit.tables[tblid].dom.cells[cell.id];
+ },
+ register : function(table, options) {
+ if(!table.id) {
+ table.id = "tablekit-table-" + TableKit._getc();
+ }
+ var id = table.id;
+ TableKit.tables[id] = TableKit.tables[id] ?
+ Object.extend(TableKit.tables[id], options || {}) :
+ Object.extend(
+ {dom : {head:null,rows:null,cells:{}},sortable:false,resizable:false,editable:false},
+ options || {}
+ );
+ },
+ notify : function(eventName, table, event) {
+ if(TableKit.tables[table.id] && TableKit.tables[table.id].observers && TableKit.tables[table.id].observers[eventName]) {
+ TableKit.tables[table.id].observers[eventName](table, event);
+ }
+ TableKit.options.observers[eventName](table, event)();
+ },
+ isSortable : function(table) {
+ return TableKit.tables[table.id] ? TableKit.tables[table.id].sortable : false;
+ },
+ isResizable : function(table) {
+ return TableKit.tables[table.id] ? TableKit.tables[table.id].resizable : false;
+ },
+ isEditable : function(table) {
+ return TableKit.tables[table.id] ? TableKit.tables[table.id].editable : false;
+ },
+ setup : function(o) {
+ Object.extend(TableKit.options, o || {} );
+ },
+ option : function(s, id, o1, o2) {
+ o1 = o1 || TableKit.options;
+ o2 = o2 || (id ? (TableKit.tables[id] ? TableKit.tables[id] : {}) : {});
+ var key = id + s;
+ if(!TableKit._opcache[key]){
+ TableKit._opcache[key] = $A($w(s)).inject([],function(a,v){
+ a.push(a[v] = o2[v] || o1[v]);
+ return a;
+ });
+ }
+ return TableKit._opcache[key];
+ },
+ e : function(event) {
+ return event || window.event;
+ },
+ tables : {},
+ _opcache : {},
+ options : {
+ autoLoad : true,
+ stripe : true,
+ sortable : true,
+ resizable : true,
+ editable : true,
+ rowEvenClass : 'roweven',
+ rowOddClass : 'rowodd',
+ sortableSelector : ['table.sortable'],
+ columnClass : 'sortcol',
+ descendingClass : 'sortdesc',
+ ascendingClass : 'sortasc',
+ defaultSortDirection : 1,
+ noSortClass : 'nosort',
+ sortFirstAscendingClass : 'sortfirstasc',
+ sortFirstDecendingClass : 'sortfirstdesc',
+ resizableSelector : ['table.resizable'],
+ minWidth : 10,
+ showHandle : true,
+ resizeOnHandleClass : 'resize-handle-active',
+ editableSelector : ['table.editable'],
+ formClassName : 'editable-cell-form',
+ noEditClass : 'noedit',
+ editAjaxURI : '/',
+ editAjaxOptions : {},
+ observers : {
+ 'onSortStart' : function(){},
+ 'onSort' : function(){},
+ 'onSortEnd' : function(){},
+ 'onResizeStart' : function(){},
+ 'onResize' : function(){},
+ 'onResizeEnd' : function(){},
+ 'onEditStart' : function(){},
+ 'onEdit' : function(){},
+ 'onEditEnd' : function(){}
+ }
+ },
+ _c : 0,
+ _getc : function() {return TableKit._c += 1;},
+ unloadTable : function(table){
+ table = $(table);
+ if(!TableKit.tables[table.id]) {return;} //if not an existing registered table return
+ var cells = TableKit.getHeaderCells(table);
+ var op = TableKit.option('sortable resizable editable noSortClass descendingClass ascendingClass columnClass sortFirstAscendingClass sortFirstDecendingClass', table.id);
+ //unregister all the sorting and resizing events
+ cells.each(function(c){
+ c = $(c);
+ if(op.sortable) {
+ if(!c.hasClassName(op.noSortClass)) {
+ Event.stopObserving(c, 'mousedown', TableKit.Sortable._sort);
+ c.removeClassName(op.columnClass);
+ c.removeClassName(op.sortFirstAscendingClass);
+ c.removeClassName(op.sortFirstDecendingClass);
+ //ensure that if table reloaded current sort is remembered via sort first class name
+ if(c.hasClassName(op.ascendingClass)) {
+ c.removeClassName(op.ascendingClass);
+ c.addClassName(op.sortFirstAscendingClass)
+ } else if (c.hasClassName(op.descendingClass)) {
+ c.removeClassName(op.descendingClass);
+ c.addClassName(op.sortFirstDecendingClass)
+ }
+ }
+ }
+ if(op.resizable) {
+ Event.stopObserving(c, 'mouseover', TableKit.Resizable.initDetect);
+ Event.stopObserving(c, 'mouseout', TableKit.Resizable.killDetect);
+ }
+ });
+ //unregister the editing events and cancel any open editors
+ if(op.editable) {
+ Event.stopObserving(table.tBodies[0], 'click', TableKit.Editable._editCell);
+ for(var c in TableKit.tables[table.id].dom.cells) {
+ if(TableKit.tables[table.id].dom.cells[c].active) {
+ var cell = $(c);
+ var editor = TableKit.Editable.getCellEditor(cell);
+ editor.cancel(cell);
+ }
+ }
+ }
+ //delete the cache
+ TableKit.tables[table.id].dom = {head:null,rows:null,cells:{}}; // TODO: watch this for mem leaks
+ },
+ reloadTable : function(table){
+ table = $(table);
+ TableKit.unloadTable(table);
+ var op = TableKit.option('sortable resizable editable', table.id);
+ if(op.sortable) {TableKit.Sortable.init(table);}
+ if(op.resizable) {TableKit.Resizable.init(table);}
+ if(op.editable) {TableKit.Editable.init(table);}
+ },
+ reload : function() {
+ for(var k in TableKit.tables) {
+ TableKit.reloadTable(k);
+ }
+ },
+ load : function() {
+ if(TableKit.options.autoLoad) {
+ if(TableKit.options.sortable) {
+ $A(TableKit.options.sortableSelector).each(function(s){
+ $$(s).each(function(t) {
+ TableKit.Sortable.init(t);
+ });
+ });
+ }
+ if(TableKit.options.resizable) {
+ $A(TableKit.options.resizableSelector).each(function(s){
+ $$(s).each(function(t) {
+ TableKit.Resizable.init(t);
+ });
+ });
+ }
+ if(TableKit.options.editable) {
+ $A(TableKit.options.editableSelector).each(function(s){
+ $$(s).each(function(t) {
+ TableKit.Editable.init(t);
+ });
+ });
+ }
+ }
+ }
+});
+
+TableKit.Rows = {
+ stripe : function(table) {
+ var rows = TableKit.getBodyRows(table);
+ rows.each(function(r,i) {
+ TableKit.Rows.addStripeClass(table,r,i);
+ });
+ },
+ addStripeClass : function(t,r,i) {
+ t = t || r.up('table');
+ var op = TableKit.option('rowEvenClass rowOddClass', t.id);
+ var css = ((i+1)%2 === 0 ? op[0] : op[1]);
+ // using prototype's assClassName/RemoveClassName was not efficient for large tables, hence:
+ var cn = r.className.split(/\s+/);
+ var newCn = [];
+ for(var x = 0, l = cn.length; x < l; x += 1) {
+ if(cn[x] !== op[0] && cn[x] !== op[1]) { newCn.push(cn[x]); }
+ }
+ newCn.push(css);
+ r.className = newCn.join(" ");
+ }
+};
+
+TableKit.Sortable = {
+ init : function(elm, options){
+ var table = $(elm);
+ if(table.tagName !== "TABLE") {
+ return;
+ }
+ TableKit.register(table,Object.extend(options || {},{sortable:true}));
+ var sortFirst;
+ var cells = TableKit.getHeaderCells(table);
+ var op = TableKit.option('noSortClass columnClass sortFirstAscendingClass sortFirstDecendingClass', table.id);
+ cells.each(function(c){
+ c = $(c);
+ if(!c.hasClassName(op.noSortClass)) {
+ Event.observe(c, 'mousedown', TableKit.Sortable._sort);
+ c.addClassName(op.columnClass);
+ if(c.hasClassName(op.sortFirstAscendingClass) || c.hasClassName(op.sortFirstDecendingClass)) {
+ sortFirst = c;
+ }
+ }
+ });
+
+ if(sortFirst) {
+ if(sortFirst.hasClassName(op.sortFirstAscendingClass)) {
+ TableKit.Sortable.sort(table, sortFirst, 1);
+ } else {
+ TableKit.Sortable.sort(table, sortFirst, -1);
+ }
+ } else { // just add row stripe classes
+ TableKit.Rows.stripe(table);
+ }
+ },
+ reload : function(table) {
+ table = $(table);
+ var cells = TableKit.getHeaderCells(table);
+ var op = TableKit.option('noSortClass columnClass', table.id);
+ cells.each(function(c){
+ c = $(c);
+ if(!c.hasClassName(op.noSortClass)) {
+ Event.stopObserving(c, 'mousedown', TableKit.Sortable._sort);
+ c.removeClassName(op.columnClass);
+ }
+ });
+ TableKit.Sortable.init(table);
+ },
+ _sort : function(e) {
+ if(TableKit.Resizable._onHandle) {return;}
+ e = TableKit.e(e);
+ Event.stop(e);
+ var cell = Event.element(e);
+ while(!(cell.tagName && cell.tagName.match(/td|th/gi))) {
+ cell = cell.parentNode;
+ }
+ TableKit.Sortable.sort(null, cell);
+ },
+ sort : function(table, index, order) {
+ var cell;
+ if(typeof index === 'number') {
+ if(!table || (table.tagName && table.tagName !== "TABLE")) {
+ return;
+ }
+ table = $(table);
+ index = Math.min(table.rows[0].cells.length, index);
+ index = Math.max(1, index);
+ index -= 1;
+ cell = (table.tHead && table.tHead.rows.length > 0) ? $(table.tHead.rows[table.tHead.rows.length-1].cells[index]) : $(table.rows[0].cells[index]);
+ } else {
+ cell = $(index);
+ table = table ? $(table) : cell.up('table');
+ index = TableKit.getCellIndex(cell);
+ }
+ var op = TableKit.option('noSortClass descendingClass ascendingClass defaultSortDirection', table.id);
+
+ if(cell.hasClassName(op.noSortClass)) {return;}
+ //TableKit.notify('onSortStart', table);
+ order = order ? order : op.defaultSortDirection;
+ var rows = TableKit.getBodyRows(table);
+
+ if(cell.hasClassName(op.ascendingClass) || cell.hasClassName(op.descendingClass)) {
+ rows.reverse(); // if it was already sorted we just need to reverse it.
+ order = cell.hasClassName(op.descendingClass) ? 1 : -1;
+ } else {
+ var datatype = TableKit.Sortable.getDataType(cell,index,table);
+ var tkst = TableKit.Sortable.types;
+ rows.sort(function(a,b) {
+ return order * tkst[datatype].compare(TableKit.getCellText(a.cells[index]),TableKit.getCellText(b.cells[index]));
+ });
+ }
+ var tb = table.tBodies[0];
+ var tkr = TableKit.Rows;
+ rows.each(function(r,i) {
+ tb.appendChild(r);
+ tkr.addStripeClass(table,r,i);
+ });
+ var hcells = TableKit.getHeaderCells(null, cell);
+ $A(hcells).each(function(c,i){
+ c = $(c);
+ c.removeClassName(op.ascendingClass);
+ c.removeClassName(op.descendingClass);
+ if(index === i) {
+ if(order === 1) {
+ c.addClassName(op.ascendingClass);
+ } else {
+ c.addClassName(op.descendingClass);
+ }
+ }
+ });
+ },
+ types : {},
+ detectors : [],
+ addSortType : function() {
+ $A(arguments).each(function(o){
+ TableKit.Sortable.types[o.name] = o;
+ });
+ },
+ getDataType : function(cell,index,table) {
+ cell = $(cell);
+ index = (index || index === 0) ? index : TableKit.getCellIndex(cell);
+
+ var colcache = TableKit.Sortable._coltypecache;
+ var cache = colcache[table.id] ? colcache[table.id] : (colcache[table.id] = {});
+
+ if(!cache[index]) {
+ var t = false;
+ // first look for a data type id on the heading row cell
+ if(cell.id && TableKit.Sortable.types[cell.id]) {
+ t = cell.id
+ }
+ if(!t) {
+ t = $w(cell.className).detect(function(n){ // then look for a data type classname on the heading row cell
+ return (TableKit.Sortable.types[n]) ? true : false;
+ });
+ }
+ if(!t) {
+ var rows = TableKit.getBodyRows(table);
+ cell = rows[0].cells[index]; // grab same index cell from body row to try and match data type
+ t = TableKit.Sortable.detectors.detect(
+ function(d){
+ return TableKit.Sortable.types[d].detect(TableKit.getCellText(cell));
+ });
+ }
+ cache[index] = t;
+ }
+ return cache[index];
+ },
+ _coltypecache : {}
+};
+
+TableKit.Sortable.detectors = $A($w('date-iso date date-eu date-au time currency datasize number casesensitivetext text')); // setting it here because Safari complained when I did it above...
+
+TableKit.Sortable.Type = Class.create();
+TableKit.Sortable.Type.prototype = {
+ initialize : function(name, options){
+ this.name = name;
+ options = Object.extend({
+ normal : function(v){
+ return v;
+ },
+ pattern : /.*/
+ }, options || {});
+ this.normal = options.normal;
+ this.pattern = options.pattern;
+ if(options.compare) {
+ this.compare = options.compare;
+ }
+ if(options.detect) {
+ this.detect = options.detect;
+ }
+ },
+ compare : function(a,b){
+ return TableKit.Sortable.Type.compare(this.normal(a), this.normal(b));
+ },
+ detect : function(v){
+ return this.pattern.test(v);
+ }
+};
+
+TableKit.Sortable.Type.compare = function(a,b) {
+ return a < b ? -1 : a === b ? 0 : 1;
+};
+
+TableKit.Sortable.addSortType(
+ new TableKit.Sortable.Type('number', {
+ pattern : /^[-+]?[\d]*\.?[\d]+(?:[eE][-+]?[\d]+)?/,
+ normal : function(v) {
+ // This will grab the first thing that looks like a number from a string, so you can use it to order a column of various srings containing numbers.
+ v = parseFloat(v.replace(/^.*?([-+]?[\d]*\.?[\d]+(?:[eE][-+]?[\d]+)?).*$/,"$1"));
+ return isNaN(v) ? 0 : v;
+ }}),
+ new TableKit.Sortable.Type('text',{
+ normal : function(v) {
+ return v ? v.toLowerCase() : '';
+ }}),
+ new TableKit.Sortable.Type('casesensitivetext',{pattern : /^[A-Z]+$/}),
+ new TableKit.Sortable.Type('datasize',{
+ pattern : /^[-+]?[\d]*\.?[\d]+(?:[eE][-+]?[\d]+)?\s?[k|m|g|t]b$/i,
+ normal : function(v) {
+ var r = v.match(/^([-+]?[\d]*\.?[\d]+([eE][-+]?[\d]+)?)\s?([k|m|g|t]?b)?/i);
+ var b = r[1] ? Number(r[1]).valueOf() : 0;
+ var m = r[3] ? r[3].substr(0,1).toLowerCase() : '';
+ var result = b;
+ switch(m) {
+ case 'k':
+ result = b * 1024;
+ break;
+ case 'm':
+ result = b * 1024 * 1024;
+ break;
+ case 'g':
+ result = b * 1024 * 1024 * 1024;
+ break;
+ case 't':
+ result = b * 1024 * 1024 * 1024 * 1024;
+ break;
+ }
+ return result;
+ }}),
+ new TableKit.Sortable.Type('date-au',{
+ pattern : /^\d{2}\/\d{2}\/\d{4}\s?(?:\d{1,2}\:\d{2}(?:\:\d{2})?\s?[a|p]?m?)?/i,
+ normal : function(v) {
+ if(!this.pattern.test(v)) {return 0;}
+ var r = v.match(/^(\d{2})\/(\d{2})\/(\d{4})\s?(?:(\d{1,2})\:(\d{2})(?:\:(\d{2}))?\s?([a|p]?m?))?/i);
+ var yr_num = r[3];
+ var mo_num = parseInt(r[2],10)-1;
+ var day_num = r[1];
+ var hr_num = r[4] ? r[4] : 0;
+ if(r[7]) {
+ var chr = parseInt(r[4],10);
+ if(r[7].toLowerCase().indexOf('p') !== -1) {
+ hr_num = chr < 12 ? chr + 12 : chr;
+ } else if(r[7].toLowerCase().indexOf('a') !== -1) {
+ hr_num = chr < 12 ? chr : 0;
+ }
+ }
+ var min_num = r[5] ? r[5] : 0;
+ var sec_num = r[6] ? r[6] : 0;
+ return new Date(yr_num, mo_num, day_num, hr_num, min_num, sec_num, 0).valueOf();
+ }}),
+ new TableKit.Sortable.Type('date-us',{
+ pattern : /^\d{2}\/\d{2}\/\d{4}\s?(?:\d{1,2}\:\d{2}(?:\:\d{2})?\s?[a|p]?m?)?/i,
+ normal : function(v) {
+ if(!this.pattern.test(v)) {return 0;}
+ var r = v.match(/^(\d{2})\/(\d{2})\/(\d{4})\s?(?:(\d{1,2})\:(\d{2})(?:\:(\d{2}))?\s?([a|p]?m?))?/i);
+ var yr_num = r[3];
+ var mo_num = parseInt(r[1],10)-1;
+ var day_num = r[2];
+ var hr_num = r[4] ? r[4] : 0;
+ if(r[7]) {
+ var chr = parseInt(r[4],10);
+ if(r[7].toLowerCase().indexOf('p') !== -1) {
+ hr_num = chr < 12 ? chr + 12 : chr;
+ } else if(r[7].toLowerCase().indexOf('a') !== -1) {
+ hr_num = chr < 12 ? chr : 0;
+ }
+ }
+ var min_num = r[5] ? r[5] : 0;
+ var sec_num = r[6] ? r[6] : 0;
+ return new Date(yr_num, mo_num, day_num, hr_num, min_num, sec_num, 0).valueOf();
+ }}),
+ new TableKit.Sortable.Type('date-eu',{
+ pattern : /^\d{2}-\d{2}-\d{4}/i,
+ normal : function(v) {
+ if(!this.pattern.test(v)) {return 0;}
+ var r = v.match(/^(\d{2})-(\d{2})-(\d{4})/);
+ var yr_num = r[3];
+ var mo_num = parseInt(r[2],10)-1;
+ var day_num = r[1];
+ return new Date(yr_num, mo_num, day_num).valueOf();
+ }}),
+ new TableKit.Sortable.Type('date-iso',{
+ pattern : /[\d]{4}-[\d]{2}-[\d]{2}(?:T[\d]{2}\:[\d]{2}(?:\:[\d]{2}(?:\.[\d]+)?)?(Z|([-+][\d]{2}:[\d]{2})?)?)?/, // 2005-03-26T19:51:34Z
+ normal : function(v) {
+ if(!this.pattern.test(v)) {return 0;}
+ var d = v.match(/([\d]{4})(-([\d]{2})(-([\d]{2})(T([\d]{2}):([\d]{2})(:([\d]{2})(\.([\d]+))?)?(Z|(([-+])([\d]{2}):([\d]{2})))?)?)?)?/);
+ var offset = 0;
+ var date = new Date(d[1], 0, 1);
+ if (d[3]) { date.setMonth(d[3] - 1) ;}
+ if (d[5]) { date.setDate(d[5]); }
+ if (d[7]) { date.setHours(d[7]); }
+ if (d[8]) { date.setMinutes(d[8]); }
+ if (d[10]) { date.setSeconds(d[10]); }
+ if (d[12]) { date.setMilliseconds(Number("0." + d[12]) * 1000); }
+ if (d[14]) {
+ offset = (Number(d[16]) * 60) + Number(d[17]);
+ offset *= ((d[15] === '-') ? 1 : -1);
+ }
+ offset -= date.getTimezoneOffset();
+ if(offset !== 0) {
+ var time = (Number(date) + (offset * 60 * 1000));
+ date.setTime(Number(time));
+ }
+ return date.valueOf();
+ }}),
+ new TableKit.Sortable.Type('date',{
+ pattern: /^(?:sun|mon|tue|wed|thu|fri|sat)\,\s\d{1,2}\s(?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\s\d{4}(?:\s\d{2}\:\d{2}(?:\:\d{2})?(?:\sGMT(?:[+-]\d{4})?)?)?/i, //Mon, 18 Dec 1995 17:28:35 GMT
+ compare : function(a,b) { // must be standard javascript date format
+ if(a && b) {
+ return TableKit.Sortable.Type.compare(new Date(a),new Date(b));
+ } else {
+ return TableKit.Sortable.Type.compare(a ? 1 : 0, b ? 1 : 0);
+ }
+ }}),
+ new TableKit.Sortable.Type('time',{
+ pattern : /^\d{1,2}\:\d{2}(?:\:\d{2})?(?:\s[a|p]m)?$/i,
+ compare : function(a,b) {
+ var d = new Date();
+ var ds = d.getMonth() + "/" + d.getDate() + "/" + d.getFullYear() + " ";
+ return TableKit.Sortable.Type.compare(new Date(ds + a),new Date(ds + b));
+ }}),
+ new TableKit.Sortable.Type('currency',{
+ pattern : /^[$����]/, // dollar,pound,yen,euro,generic currency symbol
+ normal : function(v) {
+ return v ? parseFloat(v.replace(/[^-\d\.]/g,'')) : 0;
+ }})
+);
+
+TableKit.Resizable = {
+ init : function(elm, options){
+ var table = $(elm);
+ if(table.tagName !== "TABLE") {return;}
+ TableKit.register(table,Object.extend(options || {},{resizable:true}));
+ var cells = TableKit.getHeaderCells(table);
+ cells.each(function(c){
+ c = $(c);
+ Event.observe(c, 'mouseover', TableKit.Resizable.initDetect);
+ Event.observe(c, 'mouseout', TableKit.Resizable.killDetect);
+ });
+ },
+ resize : function(table, index, w) {
+ var cell;
+ if(typeof index === 'number') {
+ if(!table || (table.tagName && table.tagName !== "TABLE")) {return;}
+ table = $(table);
+ index = Math.min(table.rows[0].cells.length, index);
+ index = Math.max(1, index);
+ index -= 1;
+ cell = (table.tHead && table.tHead.rows.length > 0) ? $(table.tHead.rows[table.tHead.rows.length-1].cells[index]) : $(table.rows[0].cells[index]);
+ } else {
+ cell = $(index);
+ table = table ? $(table) : cell.up('table');
+ index = TableKit.getCellIndex(cell);
+ }
+ var pad = parseInt(cell.getStyle('paddingLeft'),10) + parseInt(cell.getStyle('paddingRight'),10);
+ w = Math.max(w-pad, TableKit.option('minWidth', table.id)[0]);
+
+ cell.setStyle({'width' : w + 'px'});
+ },
+ initDetect : function(e) {
+ e = TableKit.e(e);
+ var cell = Event.element(e);
+ Event.observe(cell, 'mousemove', TableKit.Resizable.detectHandle);
+ Event.observe(cell, 'mousedown', TableKit.Resizable.startResize);
+ },
+ detectHandle : function(e) {
+ e = TableKit.e(e);
+ var cell = Event.element(e);
+ if(TableKit.Resizable.pointerPos(cell,Event.pointerX(e),Event.pointerY(e))){
+ cell.addClassName(TableKit.option('resizeOnHandleClass', cell.up('table').id)[0]);
+ TableKit.Resizable._onHandle = true;
+ } else {
+ cell.removeClassName(TableKit.option('resizeOnHandleClass', cell.up('table').id)[0]);
+ TableKit.Resizable._onHandle = false;
+ }
+ },
+ killDetect : function(e) {
+ e = TableKit.e(e);
+ TableKit.Resizable._onHandle = false;
+ var cell = Event.element(e);
+ Event.stopObserving(cell, 'mousemove', TableKit.Resizable.detectHandle);
+ Event.stopObserving(cell, 'mousedown', TableKit.Resizable.startResize);
+ cell.removeClassName(TableKit.option('resizeOnHandleClass', cell.up('table').id)[0]);
+ },
+ startResize : function(e) {
+ e = TableKit.e(e);
+ if(!TableKit.Resizable._onHandle) {return;}
+ var cell = Event.element(e);
+ Event.stopObserving(cell, 'mousemove', TableKit.Resizable.detectHandle);
+ Event.stopObserving(cell, 'mousedown', TableKit.Resizable.startResize);
+ Event.stopObserving(cell, 'mouseout', TableKit.Resizable.killDetect);
+ TableKit.Resizable._cell = cell;
+ var table = cell.up('table');
+ TableKit.Resizable._tbl = table;
+ if(TableKit.option('showHandle', table.id)[0]) {
+ TableKit.Resizable._handle = $(document.createElement('div')).addClassName('resize-handle').setStyle({
+ 'top' : cell.cumulativeOffset()[1] + 'px',
+ 'left' : Event.pointerX(e) + 'px',
+ 'height' : table.getDimensions().height + 'px'
+ });
+ document.body.appendChild(TableKit.Resizable._handle);
+ }
+ Event.observe(document, 'mousemove', TableKit.Resizable.drag);
+ Event.observe(document, 'mouseup', TableKit.Resizable.endResize);
+ Event.stop(e);
+ },
+ endResize : function(e) {
+ e = TableKit.e(e);
+ var cell = TableKit.Resizable._cell;
+ TableKit.Resizable.resize(null, cell, (Event.pointerX(e) - cell.cumulativeOffset()[0]));
+ Event.stopObserving(document, 'mousemove', TableKit.Resizable.drag);
+ Event.stopObserving(document, 'mouseup', TableKit.Resizable.endResize);
+ if(TableKit.option('showHandle', TableKit.Resizable._tbl.id)[0]) {
+ $$('div.resize-handle').each(function(elm){
+ document.body.removeChild(elm);
+ });
+ }
+ Event.observe(cell, 'mouseout', TableKit.Resizable.killDetect);
+ TableKit.Resizable._tbl = TableKit.Resizable._handle = TableKit.Resizable._cell = null;
+ Event.stop(e);
+ },
+ drag : function(e) {
+ e = TableKit.e(e);
+ if(TableKit.Resizable._handle === null) {
+ try {
+ TableKit.Resizable.resize(TableKit.Resizable._tbl, TableKit.Resizable._cell, (Event.pointerX(e) - TableKit.Resizable._cell.cumulativeOffset()[0]));
+ } catch(e) {}
+ } else {
+ TableKit.Resizable._handle.setStyle({'left' : Event.pointerX(e) + 'px'});
+ }
+ return false;
+ },
+ pointerPos : function(element, x, y) {
+ var offset = $(element).cumulativeOffset();
+ return (y >= offset[1] &&
+ y < offset[1] + element.offsetHeight &&
+ x >= offset[0] + element.offsetWidth - 5 &&
+ x < offset[0] + element.offsetWidth);
+ },
+ _onHandle : false,
+ _cell : null,
+ _tbl : null,
+ _handle : null
+};
+
+
+TableKit.Editable = {
+ init : function(elm, options){
+ var table = $(elm);
+ if(table.tagName !== "TABLE") {return;}
+ TableKit.register(table,Object.extend(options || {},{editable:true}));
+ Event.observe(table.tBodies[0], 'click', TableKit.Editable._editCell);
+ },
+ _editCell : function(e) {
+ e = TableKit.e(e);
+ var cell = Event.findElement(e,'td');
+ if(cell) {
+ TableKit.Editable.editCell(null, cell, null, e);
+ } else {
+ return false;
+ }
+ },
+ editCell : function(table, index, cindex, event) {
+ var cell, row;
+ if(typeof index === 'number') {
+ if(!table || (table.tagName && table.tagName !== "TABLE")) {return;}
+ table = $(table);
+ index = Math.min(table.tBodies[0].rows.length, index);
+ index = Math.max(1, index);
+ index -= 1;
+ cindex = Math.min(table.rows[0].cells.length, cindex);
+ cindex = Math.max(1, cindex);
+ cindex -= 1;
+ row = $(table.tBodies[0].rows[index]);
+ cell = $(row.cells[cindex]);
+ } else {
+ cell = $(event ? Event.findElement(event, 'td') : index);
+ table = (table && table.tagName && table.tagName !== "TABLE") ? $(table) : cell.up('table');
+ row = cell.up('tr');
+ }
+ var op = TableKit.option('noEditClass', table.id);
+ if(cell.hasClassName(op.noEditClass)) {return;}
+
+ var head = $(TableKit.getHeaderCells(table, cell)[TableKit.getCellIndex(cell)]);
+ if(head.hasClassName(op.noEditClass)) {return;}
+
+ var data = TableKit.getCellData(cell);
+ if(data.active) {return;}
+ data.htmlContent = cell.innerHTML;
+ var ftype = TableKit.Editable.getCellEditor(null,null,head);
+ ftype.edit(cell, event);
+ data.active = true;
+ },
+ getCellEditor : function(cell, table, head) {
+ var head = head ? head : $(TableKit.getHeaderCells(table, cell)[TableKit.getCellIndex(cell)]);
+ var ftype = TableKit.Editable.types['text-input'];
+ if(head.id && TableKit.Editable.types[head.id]) {
+ ftype = TableKit.Editable.types[head.id];
+ } else {
+ var n = $w(head.className).detect(function(n){
+ return (TableKit.Editable.types[n]) ? true : false;
+ });
+ ftype = n ? TableKit.Editable.types[n] : ftype;
+ }
+ return ftype;
+ },
+ types : {},
+ addCellEditor : function(o) {
+ if(o && o.name) { TableKit.Editable.types[o.name] = o; }
+ }
+};
+
+TableKit.Editable.CellEditor = Class.create();
+TableKit.Editable.CellEditor.prototype = {
+ initialize : function(name, options){
+ this.name = name;
+ this.options = Object.extend({
+ element : 'input',
+ attributes : {name : 'value', type : 'text'},
+ selectOptions : [],
+ showSubmit : true,
+ submitText : 'OK',
+ showCancel : true,
+ cancelText : 'Cancel',
+ ajaxURI : null,
+ ajaxOptions : null
+ }, options || {});
+ },
+ edit : function(cell) {
+ cell = $(cell);
+ var op = this.options;
+ var table = cell.up('table');
+
+ var form = $(document.createElement("form"));
+ form.id = cell.id + '-form';
+ form.addClassName(TableKit.option('formClassName', table.id)[0]);
+ form.onsubmit = this._submit.bindAsEventListener(this);
+
+ var field = document.createElement(op.element);
+ $H(op.attributes).each(function(v){
+ field[v.key] = v.value;
+ });
+ switch(op.element) {
+ case 'input':
+ case 'textarea':
+ field.value = TableKit.getCellText(cell);
+ break;
+
+ case 'select':
+ var txt = TableKit.getCellText(cell);
+ $A(op.selectOptions).each(function(v){
+ field.options[field.options.length] = new Option(v[0], v[1]);
+ if(txt === v[1]) {
+ field.options[field.options.length-1].selected = 'selected';
+ }
+ });
+ break;
+ }
+ form.appendChild(field);
+ if(op.element === 'textarea') {
+ form.appendChild(document.createElement("br"));
+ }
+ if(op.showSubmit) {
+ var okButton = document.createElement("input");
+ okButton.type = "submit";
+ okButton.value = op.submitText;
+ okButton.className = 'editor_ok_button';
+ form.appendChild(okButton);
+ }
+ if(op.showCancel) {
+ var cancelLink = document.createElement("a");
+ cancelLink.href = "#";
+ cancelLink.appendChild(document.createTextNode(op.cancelText));
+ cancelLink.onclick = this._cancel.bindAsEventListener(this);
+ cancelLink.className = 'editor_cancel';
+ form.appendChild(cancelLink);
+ }
+ cell.innerHTML = '';
+ cell.appendChild(form);
+ },
+ _submit : function(e) {
+ var cell = Event.findElement(e,'td');
+ var form = Event.findElement(e,'form');
+ Event.stop(e);
+ this.submit(cell,form);
+ },
+ submit : function(cell, form) {
+ var op = this.options;
+ form = form ? form : cell.down('form');
+ var head = $(TableKit.getHeaderCells(null, cell)[TableKit.getCellIndex(cell)]);
+ var row = cell.up('tr');
+ var table = cell.up('table');
+ var s = '&row=' + (TableKit.getRowIndex(row)+1) + '&cell=' + (TableKit.getCellIndex(cell)+1) + '&id=' + row.id + '&field=' + head.id + '&' + Form.serialize(form);
+ this.ajax = new Ajax.Updater(cell, op.ajaxURI || TableKit.option('editAjaxURI', table.id)[0], Object.extend(op.ajaxOptions || TableKit.option('editAjaxOptions', table.id)[0], {
+ postBody : s,
+ onComplete : function() {
+ var data = TableKit.getCellData(cell);
+ data.active = false;
+ data.refresh = true; // mark cell cache for refreshing, in case cell contents has changed and sorting is applied
+ }
+ }));
+ },
+ _cancel : function(e) {
+ var cell = Event.findElement(e,'td');
+ Event.stop(e);
+ this.cancel(cell);
+ },
+ cancel : function(cell) {
+ this.ajax = null;
+ var data = TableKit.getCellData(cell);
+ cell.innerHTML = data.htmlContent;
+ data.htmlContent = '';
+ data.active = false;
+ },
+ ajax : null
+};
+
+TableKit.Editable.textInput = function(n,attributes) {
+ TableKit.Editable.addCellEditor(new TableKit.Editable.CellEditor(n, {
+ element : 'input',
+ attributes : Object.extend({name : 'value', type : 'text'}, attributes||{})
+ }));
+};
+TableKit.Editable.textInput('text-input');
+
+TableKit.Editable.multiLineInput = function(n,attributes) {
+ TableKit.Editable.addCellEditor(new TableKit.Editable.CellEditor(n, {
+ element : 'textarea',
+ attributes : Object.extend({name : 'value', rows : '5', cols : '20'}, attributes||{})
+ }));
+};
+TableKit.Editable.multiLineInput('multi-line-input');
+
+TableKit.Editable.selectInput = function(n,attributes,selectOptions) {
+ TableKit.Editable.addCellEditor(new TableKit.Editable.CellEditor(n, {
+ element : 'select',
+ attributes : Object.extend({name : 'value'}, attributes||{}),
+ 'selectOptions' : selectOptions
+ }));
+};
+
+/*
+TableKit.Bench = {
+ bench : [],
+ start : function(){
+ TableKit.Bench.bench[0] = new Date().getTime();
+ },
+ end : function(s){
+ TableKit.Bench.bench[1] = new Date().getTime();
+ alert(s + ' ' + ((TableKit.Bench.bench[1]-TableKit.Bench.bench[0])/1000)+' seconds.') //console.log(s + ' ' + ((TableKit.Bench.bench[1]-TableKit.Bench.bench[0])/1000)+' seconds.')
+ TableKit.Bench.bench = [];
+ }
+} */
+
+document.observe("dom:loaded", TableKit.load);
\ No newline at end of file
diff --git a/test/helpers/zazen_test.rb b/test/helpers/zazen_test.rb
index d39cf04a..f71fd1b8 100644
--- a/test/helpers/zazen_test.rb
+++ b/test/helpers/zazen_test.rb
@@ -175,5 +175,33 @@ def test_translate_ids
assert_equal "This \"is\":33 \"a\":#{nodes_zip(:wiki)} !#{nodes_zip(:bird_jpg)}! \"link\":#{nodes_zip(:lion)}.",
zazen('This "is":(collections/art) "a":(/projects/wiki) !(/projects/wiki/bird)! "link":(people/lion).', :translate_ids => :zip, :node => zena)
end
+
+ def test_table_asset
+ login(:tiger)
+ @node = secure!(Node) { nodes(:status) }
+ assert_match %r{title.*
+
+ problem
+ solution
+ cost
+
+
+ dead hard drive
+ buy a new one
+ 150.0
+
+
+ hurting hands
+ take a rest
+ 0.0
+
+
+ buggy display
+ wait for a bug fix
+ 0.0
+
+}m, zazen("This is a table test:\n\n|problems|")
+ end
end
\ No newline at end of file
diff --git a/test/sites/zena/dyn_attributes.yml b/test/sites/zena/dyn_attributes.yml
index 301cf679..941564e4 100644
--- a/test/sites/zena/dyn_attributes.yml
+++ b/test/sites/zena/dyn_attributes.yml
@@ -26,7 +26,18 @@ status_fr_assigned:
key: assigned
value: gaspard
-cleanWater_en_d_tz:
+cleanWater_en_tz:
owner: cleanWater_en
key: tz
- value: Asia/Jakarta
\ No newline at end of file
+ value: Asia/Jakarta
+
+status_en_problems:
+ owner: status_en
+ key: problems
+ value: |
+ [{"type":"table"},
+ [["problem","solution","cost"],
+ ["dead hard drive", "buy a new one", 150.00],
+ ["hurting hands", "take a rest", 0.0],
+ ["buggy display", "wait for a bug fix", 0.0]
+ ]]
\ No newline at end of file