summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2015-07-18 19:27:20 +0200
committerFlorian Pritz <bluewind@xinu.at>2015-08-02 17:05:46 +0200
commit07cc0d00f670fd94d7aa0e23953d177036ded4e8 (patch)
tree197c5a70f1a09b52b1355296cee1b1540287d72d
parent22f729ba0074d5ca323d3a726822155a05539c68 (diff)
Fix checkboxes.js
- Incorrect path to .js file - Autoloading and the data-api don't work so load and run it explicitly Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r--application/views/file/upload_history.php2
-rw-r--r--public_html/data/js/application.js8
-rw-r--r--public_html/data/js/main.js2
3 files changed, 9 insertions, 3 deletions
diff --git a/application/views/file/upload_history.php b/application/views/file/upload_history.php
index 9cc6a2815..1e7ecfa62 100644
--- a/application/views/file/upload_history.php
+++ b/application/views/file/upload_history.php
@@ -1,6 +1,6 @@
<?php include 'nav_history.php'; ?>
<?php echo form_open("file/do_delete") ?>
- <div class="table-responsive" data-toggle="checkboxes" data-range="true">
+ <div class="table-responsive">
<table id="upload_history" class="table table-striped tablesorter {sortlist: [[4,1]]}">
<thead>
<tr>
diff --git a/public_html/data/js/application.js b/public_html/data/js/application.js
index 310362dd9..374ae56fe 100644
--- a/public_html/data/js/application.js
+++ b/public_html/data/js/application.js
@@ -11,7 +11,8 @@ define(
'tablesorter',
'jquery',
'jquery.lazyload',
- 'bootstrap'
+ 'bootstrap',
+ 'jquery.checkboxes'
],
function (
require,
@@ -49,6 +50,11 @@ define(
this.setupToggleSelectAllEvent();
this.setupLineWrapToggle();
this.setupLazyLoadingImages();
+ this.setupTableRangeSelect();
+ },
+
+ setupTableRangeSelect: function () {
+ $('#upload_history').checkboxes('range', true);
},
setupLineHighlight: function () {
diff --git a/public_html/data/js/main.js b/public_html/data/js/main.js
index 3ba5c5c76..482981fc7 100644
--- a/public_html/data/js/main.js
+++ b/public_html/data/js/main.js
@@ -16,7 +16,7 @@ requirejs.config({
'jquery.tablesorter': 'vendor/jquery.tablesorter.min',
'jquery.lazyload': 'vendor/jquery.lazyload',
'jquery.colorbox': 'vendor/jquery.colorbox',
- 'jquery.checkboxes': 'vendor/jquery.checkboxes-1.0.6.min.js',
+ 'jquery.checkboxes': 'vendor/jquery.checkboxes-1.0.6.min',
'underscore': 'vendor/underscore'
}
});