Skip to content

Commit

Permalink
Merge branch 'master' into gh-pages
Browse files Browse the repository at this point in the history 
Conflicts:
	index.html
  • Loading branch information
@kflorence
kflorence committed Oct 13, 2010
2 parents f494965 + 2e05df5 commit 730ab8b
Show file tree
Hide file tree
Showing 33 changed files with 15,083 additions and 77 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
@@ -0,0 +1 @@
/.project
51 changes: 51 additions & 0 deletions README.md
View file
@@ -0,0 +1,51 @@
# jQuery.tabulate
__Author__ Kyle Florence <kyle.florence@gmail.com>
__Version__ 2.1.20100627

## Change Log
* __09/27/2010__ Version 2.1
* TODO

* __06/27/2010__ Version 2.0
* FEATURES
* Added demo page.
* Added "default" theme style and images.
* Added the ability to pass content and class names in as a function.
* Changed the way columns are built via passing them in. You now pass
in row and column information into the "table" object, which is then
divided into the "rows" and "columns" objects. Each of these are
also broken down by section (usually "head", "body" and/or "foot").
This grouping seems to make more sense, logically.
* Changed the way tabulate initially gathers its data. It is now
nested within the "data" object as "source" -- also changed the
"load" function to "gather_data" as it makes more sense, logically.

* MISC
* Semantic changes, mainly for readability and namespacing.

* __06/22/2010__ Version 1.2
* BUG FIXES
* Fixed passing in rows and columns as objects (previously resulted in
an empty dataset as the object would be pushed to an array).
* Fixed rows and columns event handlers not being called because of
namespacing (namespacing of event handlers is now user controlled).
* Fixed column names if columns is passed as an object, fixed column
name if array is passed (now uses a "one" based index instead of "zero").
* FEATURES
* Added convenience methods for triggering event handlers and error
handlers ("trigger" and "error", respectfully), useful especially
when called from outside the class.
* Added a "filters" parameter to the load function which allows you
to apply filters to a single request only (does not store these filters
in class).

* __06/11/2010__ Version 1.0
* Initial release

## Contact
Found a bug? Have a suggestion? Please shoot me an email (see above).

## License
Copyright (c) 2010 Kyle Florence
Licensed under the GNU General Public License.
[http://www.gnu.org/licenses/gpl.html](http://www.gnu.org/licenses/gpl.html)
21 changes: 21 additions & 0 deletions data.php
View file
@@ -0,0 +1,21 @@
<?php

$limit = $_GET['limit'] ? $_GET['limit'] : 0;
$offset = $_GET['offset'] ? $_GET['offset'] : 0;

$data = new stdClass;

$data->count = 50;
$data->body = array();

for ($r = $offset; $r < $offset + $limit; $r++) {
$row = new stdClass;

for ($c = 0; $c < 3; $c++) {
$row->{"col" . ($c + 1)} = "row" . ($r + 1) . ", col " . ($c + 1);
}

$data->body[] = $row;
}

echo json_encode($data);
257 changes: 257 additions & 0 deletions doc/files.html
View file
@@ -0,0 +1,257 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />

<title>JsDoc Reference - File Index</title>
<meta name="generator" content="JsDoc Toolkit" />

<style type="text/css">
/* default.css */
body
{
font: 12px "Lucida Grande", Tahoma, Arial, Helvetica, sans-serif;
width: 800px;
}

.header
{
clear: both;
background-color: #ccc;
padding: 8px;
}

h1
{
font-size: 150%;
font-weight: bold;
padding: 0;
margin: 1em 0 0 .3em;
}

hr
{
border: none 0;
border-top: 1px solid #7F8FB1;
height: 1px;
}

pre.code
{
display: block;
padding: 8px;
border: 1px dashed #ccc;
}

#index
{
margin-top: 24px;
float: left;
width: 160px;
position: absolute;
left: 8px;
background-color: #F3F3F3;
padding: 8px;
}

#content
{
margin-left: 190px;
width: 600px;
}

.classList
{
list-style-type: none;
padding: 0;
margin: 0 0 0 8px;
font-family: arial, sans-serif;
font-size: 1em;
overflow: auto;
}

.classList li
{
padding: 0;
margin: 0 0 8px 0;
}

.summaryTable { width: 100%; }

h1.classTitle
{
font-size:170%;
line-height:130%;
}

h2 { font-size: 110%; }
caption, div.sectionTitle
{
background-color: #7F8FB1;
color: #fff;
font-size:130%;
text-align: left;
padding: 2px 6px 2px 6px;
border: 1px #7F8FB1 solid;
}

div.sectionTitle { margin-bottom: 8px; }
.summaryTable thead { display: none; }

.summaryTable td
{
vertical-align: top;
padding: 4px;
border-bottom: 1px #7F8FB1 solid;
border-right: 1px #7F8FB1 solid;
}

/*col#summaryAttributes {}*/
.summaryTable td.attributes
{
border-left: 1px #7F8FB1 solid;
width: 140px;
text-align: right;
}

td.attributes, .fixedFont
{
line-height: 15px;
color: #002EBE;
font-family: "Courier New",Courier,monospace;
font-size: 13px;
}

.summaryTable td.nameDescription
{
text-align: left;
font-size: 13px;
line-height: 15px;
}

.summaryTable td.nameDescription, .description
{
line-height: 15px;
padding: 4px;
padding-left: 4px;
}

.summaryTable { margin-bottom: 8px; }

ul.inheritsList
{
list-style: square;
margin-left: 20px;
padding-left: 0;
}

.detailList {
margin-left: 20px;
line-height: 15px;
}
.detailList dt { margin-left: 20px; }

.detailList .heading
{
font-weight: bold;
padding-bottom: 6px;
margin-left: 0;
}

.light, td.attributes, .light a:link, .light a:visited
{
color: #777;
font-style: italic;
}

.fineprint
{
text-align: right;
font-size: 10px;
}
</style>
</head>

<body>
<div id="header">
</div>

<div id="index">
<div align="center"><a href="index.html">Class Index</a>
| <a href="files.html">File Index</a></div>
<hr />
<h2>Classes</h2>
<ul class="classList">

<li><i><a href="symbols/_global_.html">_global_</a></i></li>

<li><a href="symbols/jQuery.html">jQuery</a></li>

<li><a href="symbols/jQuery.fn.html">jQuery.fn</a></li>

<li><a href="symbols/jQuery.tabulate.html">jQuery.tabulate</a></li>

<li><a href="symbols/jQuery.tabulate.error_handlers.html">jQuery.tabulate.error_handlers</a></li>

<li><a href="symbols/jQuery.tabulate.event_handlers.html">jQuery.tabulate.event_handlers</a></li>

<li><a href="symbols/jQuery.tabulate.filters.html">jQuery.tabulate.filters</a></li>

<li><a href="symbols/jQuery.tabulate.options.html">jQuery.tabulate.options</a></li>

<li><a href="symbols/jQuery.tabulate.options.data.html">jQuery.tabulate.options.data</a></li>

<li><a href="symbols/jQuery.tabulate.options.data.filters.html">jQuery.tabulate.options.data.filters</a></li>

<li><a href="symbols/jQuery.tabulate.options.data.source.html">jQuery.tabulate.options.data.source</a></li>

<li><a href="symbols/jQuery.tabulate.options.elements.html">jQuery.tabulate.options.elements</a></li>

<li><a href="symbols/jQuery.tabulate.options.fragments.html">jQuery.tabulate.options.fragments</a></li>

<li><a href="symbols/jQuery.tabulate.options.keys.html">jQuery.tabulate.options.keys</a></li>

<li><a href="symbols/jQuery.tabulate.options.paths.html">jQuery.tabulate.options.paths</a></li>

<li><a href="symbols/jQuery.tabulate.options.paths.images.html">jQuery.tabulate.options.paths.images</a></li>

<li><a href="symbols/jQuery.tabulate.options.table.html">jQuery.tabulate.options.table</a></li>

<li><a href="symbols/tabulate.html">tabulate</a></li>

</ul>
<hr />
</div>

<div id="content">
<h1 class="classTitle">File Index</h1>


<div>
<h2><a href="symbols/src/_home_kflorence_sandbox_jquery-tabulate_src_jquery.tabulate.js.html">jquery.tabulate.js</a></h2>

The jQuery.tabulate plugin.
<dl>

<dt class="heading">Author:</dt>
<dd><a href="mailto:kyle.florence@gmail.com">Kyle Florence</a></dd>


<dt class="heading">Version:</dt>
<dd>2.2.20101008</dd>



</dl>
</div>
<hr />


</div>
<div class="fineprint" style="clear:both">

Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.3.2 on Tue Oct 12 2010 18:20:12 GMT-0700 (PDT)
</div>
</body>
</html>

0 comments on commit 730ab8b

Please sign in to comment.