mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-01-24 09:17:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Regenerate js files (#537, #538)

Browse Source 
Remove static row tablesorter hack
Remove tablesorter plugin
This commit is contained in:
jekkos
2016-05-09 20:07:04 +02:00
parent c3f2f41888
commit 3cf018ac47
12 changed files with 83 additions and 6297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/config/routes.php
View File

@@ -56,7 +56,7 @@ $route['no_access/([^/]+)/([^/]+)'] = 'no_access/index/$1/$2';
$route['sales/index/([^/]+)'] = 'sales/manage/$1';
$route['sales/index/([^/]+)/([^/]+)'] = 'sales/manage/$1/$2';
$route['sales/index/([^/]+)/([^/]+)/([^/]+)'] = 'sales/manage/$1/$2/$3';
$route['reports/(summary_:any)/([^/]+)/([^/]+)'] = 'reports/$1/$2/$3';
$route['reports/(summary_:any)/([^/]+)/([^/]+)'] = 'reports/$1/$2/$3/$4';
$route['reports/summary_:any'] = 'reports/date_input_excel_export';
$route['reports/(graphical_:any)/([^/]+)/([^/]+)'] = 'reports/$1/$2/$3';
$route['reports/graphical_:any'] = 'reports/date_input';

2
application/views/login.php
View File

@@ -6,7 +6,7 @@
<title>Open Source Point Of Sale <?php echo $this->lang->line('login_login'); ?></title>
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
<!-- start css template tags -->
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=50ab19585f"/>
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=9ed20b1ee8"/>
<link rel="stylesheet" type="text/css" href="css/login.css"/>
<!-- end css template tags -->

8
application/views/partial/header.php
View File

@@ -8,7 +8,6 @@
<?php if ($this->input->cookie('debug') == "true" || $this->input->get("debug") == "true") : ?>
<!-- bower:css -->
<link rel="stylesheet" href="bower_components/jquery-ui/themes/base/jquery-ui.css" />
<link rel="stylesheet" href="bower_components/tablesorter/dist/css/theme.blue.min.css" />
<link rel="stylesheet" href="bower_components/bootstrap3-dialog/dist/css/bootstrap-dialog.min.css" />
<link rel="stylesheet" href="bower_components/jasny-bootstrap/dist/css/jasny-bootstrap.css" />
<link rel="stylesheet" href="bower_components/bootswatch-dist/css/bootstrap.css" />
@@ -35,7 +34,6 @@
<script src="bower_components/jquery-validate/dist/jquery.validate.js"></script>
<script src="bower_components/jquery-ui/jquery-ui.js"></script>
<script src="bower_components/swfobject-bower/swfobject/swfobject.js"></script>
<script src="bower_components/tablesorter/dist/js/jquery.tablesorter.combined.js"></script>
<script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
<script src="bower_components/bootstrap3-dialog/dist/js/bootstrap-dialog.min.js"></script>
<script src="bower_components/jasny-bootstrap/dist/js/jasny-bootstrap.js"></script>
@@ -59,12 +57,12 @@
<link rel="stylesheet" media="print" href="css/print.css" type="text/css" />
<![endif]-->
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=50ab19585f"/>
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=9ed20b1ee8"/>
<link rel="stylesheet" type="text/css" href="dist/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=9a77a9a885"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=4919801f0e"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=c2fa948de2" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=05f25623a7" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>

2
application/views/reports/date_input_excel_export.php
View File

@@ -60,7 +60,7 @@ $(document).ready(function()
var sale_type = $("#sale_type").val();
var location = window.location + '/' + start_date + '/' + end_date + '/' + sale_type;
if ($("#export_excel_yes").attr('checked'))
if ($("input[name='export_excel']").attr('checked'))
{
location += '/' + 1;
}

1
bower.json
View File

@@ -29,7 +29,6 @@
"jquery": "~1.12.3",
"jquery-ui": "1.11.4",
"swfobject-bower": "2.3.0",
"tablesorter": "jquery.tablesorter#^2.26.0",
"bootstrap3-dialog": "bootstrap-dialog#^1.35.1",
"jasny-bootstrap": "^3.1.3",
"bootswatch-dist": "3.3.6-flatly",

4
dist/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

6226
dist/opensourcepos.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/opensourcepos.min.css vendored
View File

File diff suppressed because one or more lines are too long

41
dist/opensourcepos.min.js vendored
View File

File diff suppressed because one or more lines are too long

81
js/jquery.tablesorter.staticrow.js
View File

@@ -1,81 +0,0 @@
/*
*
* StaticRow widget for jQuery TableSorter 2.0
* Version 1.0
*
* Copyright (c) 2011 Nils Luxton
* Licensed under the MIT license:
* http://www.opensource.org/licenses/mit-license.php
*
*/
$.tablesorter.addWidget({
// Give the new Widget an ID to be used in the tablesorter() call, as follows:
// $('#myElement').tablesorter({ widgets: ['zebra','staticRow'] });
id: 'staticRow',
// "Format" is run on all widgets once when the tablesorter has finished initialising,
// and then again every time a sort has finished.
format: function(table) {
// Use a property of the function to determine
// whether this is the first run of "Format"
// (i.e. is this the table's default starting position,
// or has it been sorted?)
if (typeof $(table).data('hasSorted') == 'undefined')
{
$(table).data('hasSorted', true); // This will force us into the "else" block the next time "Format" is run
// "Index" the static rows, saving their current (starting)
// position in the table inside a data() param on the
// <tr> element itself for later use.
$('tbody .static', table).each(function() {
$(this).data('tableindex', $(this).index());
});
}
else
{
// Loop the static rows, moving them to their
// original "indexed" position, and keep doing
// this until no more re-shuffling needs doing
var hasShuffled = true;
while (hasShuffled)
{
hasShuffled = false;
$('tbody .static', table).each(function() {
var targetIndex = $(this).data('tableindex');
if (targetIndex != $(this).index())
{
hasShuffled = true;
var thisRow = $(this).detach();
var numRows = $('tbody tr', table).length;
// Are we trying to be the last row?
if (targetIndex >= numRows)
{
thisRow.appendTo($('tbody', table));
}
// Are we trying to be the first row?
else if (targetIndex == 0)
{
thisRow.prependTo($('tbody', table));
}
// No, we want to be somewhere in the middle!
else
{
thisRow.insertBefore($('tbody tr:eq(' + targetIndex + ')', table));
}
}
});
}
}
$('tbody .static-last', table).each(function() {
var row = $(this).detach();
row.appendTo($('tbody', table));
});
}
});

2
templates/spacelab/views/login.php
View File

@@ -6,7 +6,7 @@
<title>Open Source Point Of Sale <?php echo $this->lang->line('login_login'); ?></title>
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
<!-- start css template tags -->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=50ab19585f"/>
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=9ed20b1ee8"/>
<link rel="stylesheet" type="text/css" href="css/login.css"/>
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/style.css"/>
<!-- end css template tags -->

7
templates/spacelab/views/partial/header.php
View File

@@ -47,7 +47,6 @@
<script src="bower_components/bootstrap-daterangepicker/daterangepicker.js"></script>
<!-- endbower -->
<!-- start js template tags -->
<script type="text/javascript" src="js/jquery.tablesorter.staticrow.js" language="javascript"></script>
<script type="text/javascript" src="js/common.js" language="javascript"></script>
<script type="text/javascript" src="js/imgpreview.full.jquery.js" language="javascript"></script>
<script type="text/javascript" src="js/manage_tables.js" language="javascript"></script>
@@ -58,14 +57,14 @@
<!--[if lte IE 8]>
<link rel="stylesheet" media="print" href="css/print.css" type="text/css" />
<![endif]-->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=50ab19585f"/>
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=9ed20b1ee8"/>
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=9a77a9a885"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=4919801f0e"/>
<!-- end mincss template tags -->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/style.css"/>
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=c2fa948de2" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=05f25623a7" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>