summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--application/views/file/upload_history.php7
-rw-r--r--data/js/jquery.metadata.js120
-rw-r--r--data/js/script.js35
3 files changed, 136 insertions, 26 deletions
diff --git a/application/views/file/upload_history.php b/application/views/file/upload_history.php
index 634ad5935..5015e9bf6 100644
--- a/application/views/file/upload_history.php
+++ b/application/views/file/upload_history.php
@@ -1,11 +1,12 @@
<?php register_js_include("/data/js/jquery.tablesorter.min.js"); ?>
+<?php register_js_include("/data/js/jquery.metadata.js"); ?>
<?php include 'nav_history.php'; ?>
<?php echo form_open("file/do_delete") ?>
<div class="table-responsive">
- <table id="upload_history" class="table table-striped tablesorter">
+ <table id="upload_history" class="table table-striped tablesorter {sortlist: [[4,1]]}">
<thead>
<tr>
- <th><input type="checkbox" name="all-ids" id="history-all"></th>
+ <th class="{sorter: false}"><input type="checkbox" name="all-ids" id="history-all"></th>
<th>ID</th>
<th>Filename</th>
<th>Mimetype
@@ -20,7 +21,7 @@
<td><a href="<?php echo site_url("/".$item["id"]) ?>/"><?php echo $item["id"] ?></a></td>
<td class="wrap"><?php echo htmlspecialchars($item["filename"]); ?></td>
<td><?php echo $item["mimetype"] ?></td>
- <td class="nowrap"><?php echo date("r", $item["date"]); ?><span class="hidden">t=<?php echo $item["date"]; ?></span></td>
+ <td class="nowrap" data-sort-value="<?=$item["date"]; ?>"><?php echo date("r", $item["date"]); ?></td>
<td><?php echo $item["filesize"] ?></td>
</tr>
<?php endforeach; ?>
diff --git a/data/js/jquery.metadata.js b/data/js/jquery.metadata.js
new file mode 100644
index 000000000..eb98e80ad
--- /dev/null
+++ b/data/js/jquery.metadata.js
@@ -0,0 +1,120 @@
+/*
+ * Metadata - jQuery plugin for parsing metadata from elements
+ *
+ * Copyright (c) 2006 John Resig, Yehuda Katz, Jörn Zaefferer, Paul McLanahan
+ *
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ */
+
+/**
+ * Sets the type of metadata to use. Metadata is encoded in JSON, and each property
+ * in the JSON will become a property of the element itself.
+ *
+ * There are three supported types of metadata storage:
+ *
+ * attr: Inside an attribute. The name parameter indicates *which* attribute.
+ *
+ * class: Inside the class attribute, wrapped in curly braces: { }
+ *
+ * elem: Inside a child element (e.g. a script tag). The
+ * name parameter indicates *which* element.
+ *
+ * The metadata for an element is loaded the first time the element is accessed via jQuery.
+ *
+ * As a result, you can define the metadata type, use $(expr) to load the metadata into the elements
+ * matched by expr, then redefine the metadata type and run another $(expr) for other elements.
+ *
+ * @name $.metadata.setType
+ *
+ * @example <p id="one" class="some_class {item_id: 1, item_label: 'Label'}">This is a p</p>
+ * @before $.metadata.setType("class")
+ * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label"
+ * @desc Reads metadata from the class attribute
+ *
+ * @example <p id="one" class="some_class" data="{item_id: 1, item_label: 'Label'}">This is a p</p>
+ * @before $.metadata.setType("attr", "data")
+ * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label"
+ * @desc Reads metadata from a "data" attribute
+ *
+ * @example <p id="one" class="some_class"><script>{item_id: 1, item_label: 'Label'}</script>This is a p</p>
+ * @before $.metadata.setType("elem", "script")
+ * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label"
+ * @desc Reads metadata from a nested script element
+ *
+ * @param String type The encoding type
+ * @param String name The name of the attribute to be used to get metadata (optional)
+ * @cat Plugins/Metadata
+ * @descr Sets the type of encoding to be used when loading metadata for the first time
+ * @type undefined
+ * @see metadata()
+ */
+
+(function($) {
+
+$.extend({
+ metadata : {
+ defaults : {
+ type: 'class',
+ name: 'metadata',
+ cre: /({.*})/,
+ single: 'metadata'
+ },
+ setType: function( type, name ){
+ this.defaults.type = type;
+ this.defaults.name = name;
+ },
+ get: function( elem, opts ){
+ var settings = $.extend({},this.defaults,opts);
+ // check for empty string in single property
+ if ( !settings.single.length ) settings.single = 'metadata';
+
+ var data = $.data(elem, settings.single);
+ // returned cached data if it already exists
+ if ( data ) return data;
+
+ data = "{}";
+
+ if ( settings.type == "class" ) {
+ var m = settings.cre.exec( elem.className );
+ if ( m )
+ data = m[1];
+ } else if ( settings.type == "elem" ) {
+ if( !elem.getElementsByTagName )
+ return undefined;
+ var e = elem.getElementsByTagName(settings.name);
+ if ( e.length )
+ data = $.trim(e[0].innerHTML);
+ } else if ( elem.getAttribute != undefined ) {
+ var attr = elem.getAttribute( settings.name );
+ if ( attr )
+ data = attr;
+ }
+
+ if ( data.indexOf( '{' ) <0 )
+ data = "{" + data + "}";
+
+ data = eval("(" + data + ")");
+
+ $.data( elem, settings.single, data );
+ return data;
+ }
+ }
+});
+
+/**
+ * Returns the metadata object for the first member of the jQuery object.
+ *
+ * @name metadata
+ * @descr Returns element's metadata object
+ * @param Object opts An object contianing settings to override the defaults
+ * @type jQuery
+ * @cat Plugins/Metadata
+ */
+$.fn.metadata = function( opts ){
+ return $.metadata.get( this[0], opts );
+};
+
+})(jQuery); \ No newline at end of file
diff --git a/data/js/script.js b/data/js/script.js
index ea9bac814..9e535643c 100644
--- a/data/js/script.js
+++ b/data/js/script.js
@@ -185,30 +185,19 @@ function fixedEncodeURIComponent (str) {
},
type: 'numeric'
});
- $.tablesorter.addParser({
- // set a unique id
- id: 'mydate',
- re: /t=([0-9]+)$/,
- is: function(s) {
- // return false so this parser is not auto detected
- return false;
- },
- format: function(s) {
- var matches = this.re.exec(s);
- if (!matches) {
- return 0;
+
+ $(".tablesorter").tablesorter({
+ textExtraction: function(node) {
+ var attr = $(node).attr('data-sort-value');
+ if (typeof attr !== 'undefined' && attr !== false) {
+ var intAttr = parseInt(attr);
+ if (!isNaN(intAttr)) {
+ return intAttr;
+ }
+ return attr;
}
- //console.log(s, matches);
- return matches[1];
- },
- type: 'numeric'
- });
- $("#upload_history:has(tbody tr)").tablesorter({
- headers: {
- 0: {sorter: false},
- 4: {sorter: "mydate"},
- },
- sortList: [[4,1]],
+ return $(node).text();
+ }
});
}