Merge pull request #278 from jmmastey/updated-minified-js
@jmmastey LGTM 👍 Good call on removing the stock photos that shipped with this as well as updating libs and removing cruft. Thank you as always 🙇
This commit is contained in:
@@ -33,7 +33,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<%= javascript_include_tag "jquery.dataTables.js"%>
|
||||
<%= javascript_include_tag "jquery.dataTables.min.js"%>
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<%= javascript_include_tag "jquery.dataTables.js"%>
|
||||
<%= javascript_include_tag "jquery.dataTables.min.js"%>
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
@@ -51,4 +51,4 @@ $(document).ready(
|
||||
makeActive,
|
||||
loadTable()
|
||||
);
|
||||
</script>
|
||||
</script>
|
||||
|
||||
@@ -118,7 +118,8 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<%= javascript_include_tag "fullcalendar.js" %>
|
||||
<%= javascript_include_tag "moment.min.js" %>
|
||||
<%= javascript_include_tag "fullcalendar.min.js" %>
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
@@ -129,8 +130,10 @@ function makeActive(){
|
||||
};
|
||||
|
||||
|
||||
$('#calendar').fullCalendar({
|
||||
events: <%= get_pto_schedule_schedule_index_path(:format => "json").inspect.html_safe %>,
|
||||
$(document).ready(function() {
|
||||
$('#calendar').fullCalendar({
|
||||
events: <%= get_pto_schedule_schedule_index_path(:format => "json").inspect.html_safe %>,
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -245,4 +248,4 @@ $("#cal_update_submit").click(function(event) {
|
||||
});
|
||||
});
|
||||
|
||||
</script>
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user