mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-15 20:37:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove JQmigrate, update plugins, regen dist files, manual fix of template header (#328)

Browse Source
This commit is contained in:
FrancescoUK
2016-03-20 22:20:40 +00:00
parent 06420fa4b0
commit 3a4e9d9107
5 changed files with 73 additions and 777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,6 @@
<!-- bower:js -->
<script src="bower_components/jquery/dist/jquery.js"></script>
<script src="bower_components/jquery-bgiframe/jquery.bgiframe.js"></script>
<script src="bower_components/jquery-migrate/jquery-migrate.js"></script>
<script src="bower_components/jquery-form/jquery.form.js"></script>
<script src="bower_components/jquery-validate/dist/jquery.validate.js"></script>
<script src="bower_components/jquery-ui/jquery-ui.js"></script>
@@ -69,7 +68,7 @@
<link rel="stylesheet" type="text/css" href="dist/opensourcepos_bower.css"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=e795d0fd70" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=270497bb26" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>

7
bower.json
View File

@@ -25,15 +25,14 @@
],
"dependencies": {
"jquery-bgiframe": "~3.0.1",
"jquery-migrate": "~1.3.0",
"jquery-color": "~2.1.2",
"jquery-form": "~3.46.0",
"jquery-validate": "~1.13.1",
"jquery": "~1.12.1",
"jquery": "~1.12.2",
"jquery-ui": "1.11.4",
"swfobject-bower": "2.3.0",
"tablesorter": "jquery.tablesorter#^2.20.1",
"bootstrap3-dialog": "bootstrap-dialog#^1.34.9",
"tablesorter": "jquery.tablesorter#^2.25.6",
"bootstrap3-dialog": "bootstrap-dialog#^1.35.0",
"jasny-bootstrap": "^3.1.3",
"bootswatch-dist": "3.3.6-flatly",
"smalot-bootstrap-datetimepicker": "^2.3.8",

782
dist/opensourcepos.js vendored
View File

File diff suppressed because one or more lines are too long

50
dist/opensourcepos.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@@ -18,8 +18,8 @@
<link rel="stylesheet" href="../bower_components/bootstrap-daterangepicker/daterangepicker.css" />
<!-- endbower -->
<!-- start css template tags -->
<link rel="stylesheet" type="text/css" href="css/autocomplete.css"/>
<link rel="stylesheet" type="text/css" href="css/barcode_font.css"/>
<link rel="stylesheet" type="text/css" href="css/bootstrap.autocomplete.css"/>
<link rel="stylesheet" type="text/css" href="css/general.css"/>
<link rel="stylesheet" type="text/css" href="css/invoice.css"/>
<link rel="stylesheet" type="text/css" href="css/ospos.css"/>
@@ -33,7 +33,6 @@
<!-- bower:js -->
<script src="../bower_components/jquery/dist/jquery.js"></script>
<script src="../bower_components/jquery-bgiframe/jquery.bgiframe.js"></script>
<script src="../bower_components/jquery-migrate/jquery-migrate.js"></script>
<script src="../bower_components/jquery-form/jquery.form.js"></script>
<script src="../bower_components/jquery-validate/dist/jquery.validate.js"></script>
<script src="../bower_components/jquery-ui/jquery-ui.js"></script>
@@ -50,7 +49,6 @@
<script src="../bower_components/bootstrap-daterangepicker/daterangepicker.js"></script>
<!-- endbower -->
<!-- start js template tags -->
<script type="text/javascript" src="js/jquery.ajax_queue.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.jkey-1.1.js" language="javascript"></script>
<script type="text/javascript" src="js/jquery.tablesorter.staticrow.js" language="javascript"></script>
<script type="text/javascript" src="js/common.js" language="javascript"></script>
@@ -65,11 +63,13 @@
<![endif]-->
<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=19fb7e2d85"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos_bower.css"/>
<!-- 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=e795d0fd70" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=270497bb26" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>