git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove turbolinks in form for conflict

Browse Source
This commit is contained in:
Yan
2017-10-30 17:26:38 +06:30
parent 7beb4e7563
commit da0558b5ef
29 changed files with 34 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/BSBMaterial/admin.js
View File

@@ -444,7 +444,7 @@ $.AdminBSB.browser = {
} }
//========================================================================================================================== //==========================================================================================================================
$(document).on('turbolinks:load', function() { $(document).ready(function() {
$.AdminBSB.browser.activate(); $.AdminBSB.browser.activate();
$.AdminBSB.leftSideBar.activate(); $.AdminBSB.leftSideBar.activate();
$.AdminBSB.rightSideBar.activate(); $.AdminBSB.rightSideBar.activate();

2
app/assets/javascripts/BSBMaterial/demo.js
View File

@@ -1,4 +1,4 @@
$(document).on('turbolinks:load', function() { $(document).ready(function() {
skinChanger(); skinChanger();
activateNotificationAndTasksScroll(); activateNotificationAndTasksScroll();

10
app/assets/javascripts/application.js
View File

@@ -11,12 +11,12 @@
// about supported directives. // about supported directives.
// //
//= require jquery //= require jquery
//= require jquery.turbolinks //= require jquery_nested_form
//= require tether
//= require jquery_ujs //= require jquery_ujs
//= require cable
//= require tether
//= require bootstrap/js/popper.min //= require bootstrap/js/popper.min
//= require bootstrap/js/bootstrap-material-design.min //= require bootstrap/js/bootstrap-material-design.min
//= require jquery_nested_form
//= require momentjs/moment //= require momentjs/moment
//= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
//= require multi-select/js/jquery.multi-select.js //= require multi-select/js/jquery.multi-select.js
@@ -29,14 +29,12 @@
//= require raphael/raphael.min //= require raphael/raphael.min
//= require chartjs/Chart.bundle.js //= require chartjs/Chart.bundle.js
//= require fileinput.min //= require fileinput.min
//= require cable
//= require turbolinks
//= require settings/processing_items //= require settings/processing_items
//= require BSBMaterial/admin.js //= require BSBMaterial/admin.js
//= require BSBMaterial/demo.js //= require BSBMaterial/demo.js
//= require custom.js //= require custom.js
$(document).on('turbolinks:load', function() { $(document).ready(function() {
$('.count-to').countTo(); $('.count-to').countTo();
//Sales count to //Sales count to

2
app/assets/javascripts/custom.js
View File

@@ -1,4 +1,4 @@
$(document).on('turbolinks:load', function() { $(document).ready(function() {
$('body').bootstrapMaterialDesign(); $('body').bootstrapMaterialDesign();
var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight())); var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));

2
app/assets/javascripts/settings/processing_items.js
View File

@@ -1,4 +1,4 @@
$(document).on('turbolinks:load', function() { $(document).ready(function() {
$(".processitems").click(function(event){ $(".processitems").click(function(event){
event.preventDefault(); event.preventDefault();
console.log($(this).data("id")); console.log($(this).data("id"));

4
app/views/layouts/application.html.erb
View File

@@ -10,8 +10,8 @@
<!-- Favicon--> <!-- Favicon-->
<link rel="icon" href="/favicon.ico" type="image/x-icon"> <link rel="icon" href="/favicon.ico" type="image/x-icon">
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= stylesheet_link_tag 'application', media: 'all' %>
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application' %>
</head> </head>
<body class="theme-indigo"> <body class="theme-indigo">

6
app/views/settings/cashier_terminals/_form.html.erb
View File

@@ -54,8 +54,4 @@
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/commissioners/_form.html.erb
View File

@@ -52,8 +52,4 @@
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/commissions/_form.html.erb
View File

@@ -44,8 +44,4 @@
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/item_sets/_form.html.erb
View File

@@ -40,8 +40,4 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/lookups/_form.html.erb
View File

@@ -28,8 +28,4 @@
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/membership_actions/_form.html.erb
View File

@@ -30,8 +30,4 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/membership_settings/_form.html.erb
View File

@@ -32,8 +32,4 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/menu_categories/_form.html.erb
View File

@@ -44,8 +44,4 @@
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/menu_item_attributes/_form.html.erb
View File

@@ -36,8 +36,4 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/menu_item_options/_form.html.erb
View File

@@ -37,8 +37,4 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/menu_item_sets/_form.html.erb
View File

@@ -26,8 +26,4 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/menus/_form.html.erb
View File

@@ -66,8 +66,4 @@
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/order_queue_stations/_form.html.erb
View File

@@ -59,8 +59,4 @@ div.form-inputs span{
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/payment_method_settings/_form.html.erb
View File

@@ -46,8 +46,4 @@
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/processing_items/_form.html.erb
View File

@@ -85,8 +85,4 @@
</div> </div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/products/_form.html.erb
View File

@@ -62,8 +62,4 @@
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/promotion_products/_form.html.erb
View File

@@ -45,8 +45,4 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/rooms/_form.html.erb
View File

@@ -77,8 +77,4 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/set_menu_items/_form.html.erb
View File

@@ -91,8 +91,4 @@
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/simple_menu_items/_form.html.erb
View File

@@ -81,8 +81,4 @@
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/tables/_form.html.erb
View File

@@ -72,8 +72,4 @@
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

6
app/views/settings/tax_profiles/_form.html.erb
View File

@@ -41,9 +41,5 @@
</div> </div>
</div> </div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
});
</script>

1
config/initializers/assets.rb
View File

@@ -48,3 +48,4 @@ Rails.application.config.assets.precompile += %w( sx-sidebar.css )
Rails.application.config.assets.precompile += %w( inventory_definitions.css ) Rails.application.config.assets.precompile += %w( inventory_definitions.css )
Rails.application.config.assets.precompile += %w( inventory.js ) Rails.application.config.assets.precompile += %w( inventory.js )