Skip to content

Commit

Permalink
Updated JS for mesour.dateTimePicker
Browse files Browse the repository at this point in the history
  • Loading branch information
mesour committed Mar 13, 2016
1 parent f2fce2f commit e30e9ac
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 48 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"nette/robot-loader": "~2.3.0",
"nette/database": "~2.3.0",
"doctrine/orm": "^2.5",
"mesour/array-manager": "dev-master"
"mesour/array-manager": "3.0.*@beta"
},
"minimum-stability": "beta",
"prefer-stable": true,
Expand Down
10 changes: 6 additions & 4 deletions examples/basic.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@
integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">

<link rel="stylesheet" href="../vendor/mesour/components/public/DateTimePicker/bootstrap-datetimepicker.min.css">

<link rel="stylesheet" href="../public/src/mesour.grid.css">
<link rel="stylesheet" href="../vendor/mesour/filter/public/datetimepicker.css">
<link rel="stylesheet" href="../vendor/mesour/filter/public/mesour.filter.min.css">
<link rel="stylesheet" href="../vendor/mesour/selection/public/mesour.selection.css">

Expand Down Expand Up @@ -203,9 +204,10 @@
integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
crossorigin="anonymous"></script>

<script src="../vendor/mesour/components/public/mesour.components.js"></script>
<script src="../vendor/mesour/filter/public/bootstrap.datetimepicker.js"></script>
<script src="../vendor/mesour/components/public/cookie.js"></script>
<script src="../vendor/mesour/components/public/DateTimePicker/moment.min.js"></script>
<script src="../vendor/mesour/components/public/DateTimePicker/bootstrap-datetimepicker.min.js"></script>

<script src="../vendor/mesour/components/public/mesour.components.min.js"></script>

<script src="../vendor/mesour/filter/public/src/mesour.filter.js"></script>
<script src="../vendor/mesour/filter/public/src/mesour.filter.Checkers.js"></script>
Expand Down
26 changes: 6 additions & 20 deletions examples/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,9 @@
integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">

<link rel="stylesheet" href="../public/src/mesour.grid.css">
<link rel="stylesheet" href="../vendor/mesour/filter/public/datetimepicker.css">
<link rel="stylesheet" href="../vendor/mesour/filter/public/mesour.filter.min.css">
<link rel="stylesheet" href="../vendor/mesour/selection/public/mesour.selection.css">
<link rel="stylesheet" href="../vendor/mesour/components/public/DateTimePicker/bootstrap-datetimepicker.min.css">

<link rel="stylesheet" href="../public/mesour.grid.min.css">

<hr>

Expand Down Expand Up @@ -352,19 +350,7 @@ function createTestButton(\Mesour\Components\Control\IControl $parent, $name)
integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
crossorigin="anonymous"></script>

<script src="../vendor/mesour/components/public/mesour.components.js"></script>
<script src="../vendor/mesour/filter/public/bootstrap.datetimepicker.js"></script>
<script src="../vendor/mesour/components/public/cookie.js"></script>

<script src="../vendor/mesour/filter/public/src/mesour.filter.js"></script>
<script src="../vendor/mesour/filter/public/src/mesour.filter.Checkers.js"></script>
<script src="../vendor/mesour/filter/public/src/mesour.filter.CustomFilter.js"></script>
<script src="../vendor/mesour/filter/public/src/mesour.filter.Filter.js"></script>
<script src="../vendor/mesour/filter/public/src/mesour.filter.DropDown.js"></script>

<script src="../vendor/mesour/selection/public/mesour.selection.js"></script>
<script src="../vendor/mesour/pager/public/mesour.advancedPager.js"></script>
<script src="../public/src/mesour.grid.core.js"></script>
<script src="../public/src/mesour.grid.sortable.js"></script>
<script src="../public/src/mesour.grid.selection.js"></script>
<script src="../public/src/mesour.grid.editable.js"></script>
<script src="../vendor/mesour/components/public/DateTimePicker/moment.min.js"></script>
<script src="../vendor/mesour/components/public/DateTimePicker/bootstrap-datetimepicker.min.js"></script>

<script src="../public/mesour.grid.min.js"></script>
Loading

0 comments on commit e30e9ac

Please sign in to comment.