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

fixed menu loading

Browse Source
This commit is contained in:
NyanLinHtut
2020-03-04 11:58:21 +06:30
parent 052be7f028
commit 82ab2c7ef0
4 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,7 +44,7 @@ $.AdminBSB.options = {
/* Left Sidebar - Function ================================================================================================= /* Left Sidebar - Function =================================================================================================
* You can manage the left sidebar menu options * You can manage the left sidebar menu options
* *
*/ */
$.AdminBSB.leftSideBar = { $.AdminBSB.leftSideBar = {
activate: function () { activate: function () {
@@ -157,7 +157,7 @@ $.AdminBSB.leftSideBar = {
/* Right Sidebar - Function ================================================================================================ /* Right Sidebar - Function ================================================================================================
* You can manage the right sidebar menu options * You can manage the right sidebar menu options
* *
*/ */
$.AdminBSB.rightSideBar = { $.AdminBSB.rightSideBar = {
activate: function () { activate: function () {
@@ -189,7 +189,7 @@ $.AdminBSB.rightSideBar = {
/* Searchbar - Function ================================================================================================ /* Searchbar - Function ================================================================================================
* You can manage the search bar * You can manage the search bar
* *
*/ */
var $searchBar = $('.search-bar'); var $searchBar = $('.search-bar');
$.AdminBSB.search = { $.AdminBSB.search = {
@@ -226,7 +226,7 @@ $.AdminBSB.search = {
/* Navbar - Function ======================================================================================================= /* Navbar - Function =======================================================================================================
* You can manage the navbar * You can manage the navbar
* *
*/ */
$.AdminBSB.navbar = { $.AdminBSB.navbar = {
activate: function () { activate: function () {
@@ -256,7 +256,7 @@ $.AdminBSB.navbar = {
/* Input - Function ======================================================================================================== /* Input - Function ========================================================================================================
* You can manage the inputs(also textareas) with name of class 'form-control' * You can manage the inputs(also textareas) with name of class 'form-control'
* *
*/ */
$.AdminBSB.input = { $.AdminBSB.input = {
activate: function () { activate: function () {
@@ -293,7 +293,7 @@ $.AdminBSB.input = {
/* Form - Select - Function ================================================================================================ /* Form - Select - Function ================================================================================================
* You can manage the 'select' of form elements * You can manage the 'select' of form elements
* *
*/ */
$.AdminBSB.select = { $.AdminBSB.select = {
activate: function () { activate: function () {
@@ -304,7 +304,7 @@ $.AdminBSB.select = {
/* DropdownMenu - Function ================================================================================================= /* DropdownMenu - Function =================================================================================================
* You can manage the dropdown menu * You can manage the dropdown menu
* *
*/ */
$.AdminBSB.dropdownMenu = { $.AdminBSB.dropdownMenu = {
@@ -382,7 +382,7 @@ $.AdminBSB.dropdownMenu = {
/* Browser - Function ====================================================================================================== /* Browser - Function ======================================================================================================
* You can manage browser * You can manage browser
* *
*/ */
var edge = 'Microsoft Edge'; var edge = 'Microsoft Edge';
var ie10 = 'Internet Explorer 10'; var ie10 = 'Internet Explorer 10';
@@ -454,5 +454,8 @@ $(document).ready(function() {
$.AdminBSB.select.activate(); $.AdminBSB.select.activate();
$.AdminBSB.search.activate(); $.AdminBSB.search.activate();
setTimeout(function () { $('.page-loader-wrapper').fadeOut(); }, 50); if (window.location.href.substring(window.location.href.lastIndexOf('/') + 1) == "food_court#") {
}); }else{
setTimeout(function () { $('.page-loader-wrapper').fadeOut(); }, 50);
}
});

18
app/assets/javascripts/BSBMaterial/turbolink_admin.js
View File

@@ -44,7 +44,7 @@ $.AdminBSB.options = {
/* Left Sidebar - Function ================================================================================================= /* Left Sidebar - Function =================================================================================================
* You can manage the left sidebar menu options * You can manage the left sidebar menu options
* *
*/ */
$.AdminBSB.leftSideBar = { $.AdminBSB.leftSideBar = {
activate: function () { activate: function () {
@@ -157,7 +157,7 @@ $.AdminBSB.leftSideBar = {
/* Right Sidebar - Function ================================================================================================ /* Right Sidebar - Function ================================================================================================
* You can manage the right sidebar menu options * You can manage the right sidebar menu options
* *
*/ */
$.AdminBSB.rightSideBar = { $.AdminBSB.rightSideBar = {
activate: function () { activate: function () {
@@ -189,7 +189,7 @@ $.AdminBSB.rightSideBar = {
/* Searchbar - Function ================================================================================================ /* Searchbar - Function ================================================================================================
* You can manage the search bar * You can manage the search bar
* *
*/ */
var $searchBar = $('.search-bar'); var $searchBar = $('.search-bar');
$.AdminBSB.search = { $.AdminBSB.search = {
@@ -226,7 +226,7 @@ $.AdminBSB.search = {
/* Navbar - Function ======================================================================================================= /* Navbar - Function =======================================================================================================
* You can manage the navbar * You can manage the navbar
* *
*/ */
$.AdminBSB.navbar = { $.AdminBSB.navbar = {
activate: function () { activate: function () {
@@ -256,7 +256,7 @@ $.AdminBSB.navbar = {
/* Input - Function ======================================================================================================== /* Input - Function ========================================================================================================
* You can manage the inputs(also textareas) with name of class 'form-control' * You can manage the inputs(also textareas) with name of class 'form-control'
* *
*/ */
$.AdminBSB.input = { $.AdminBSB.input = {
activate: function () { activate: function () {
@@ -293,7 +293,7 @@ $.AdminBSB.input = {
/* Form - Select - Function ================================================================================================ /* Form - Select - Function ================================================================================================
* You can manage the 'select' of form elements * You can manage the 'select' of form elements
* *
*/ */
$.AdminBSB.select = { $.AdminBSB.select = {
activate: function () { activate: function () {
@@ -304,7 +304,7 @@ $.AdminBSB.select = {
/* DropdownMenu - Function ================================================================================================= /* DropdownMenu - Function =================================================================================================
* You can manage the dropdown menu * You can manage the dropdown menu
* *
*/ */
$.AdminBSB.dropdownMenu = { $.AdminBSB.dropdownMenu = {
@@ -382,7 +382,7 @@ $.AdminBSB.dropdownMenu = {
/* Browser - Function ====================================================================================================== /* Browser - Function ======================================================================================================
* You can manage browser * You can manage browser
* *
*/ */
var edge = 'Microsoft Edge'; var edge = 'Microsoft Edge';
var ie10 = 'Internet Explorer 10'; var ie10 = 'Internet Explorer 10';
@@ -455,4 +455,4 @@ $(document).on('turbolinks:load', function() {
$.AdminBSB.search.activate(); $.AdminBSB.search.activate();
setTimeout(function () { $('.page-loader-wrapper').fadeOut(); }, 50); setTimeout(function () { $('.page-loader-wrapper').fadeOut(); }, 50);
}); });

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

@@ -65,7 +65,7 @@ $(document).ready(function() {
clearButton: true, clearButton: true,
date: false date: false
}); });
// Image Upload // Image Upload
$("#simple_menu_item_image_path").fileinput({ $("#simple_menu_item_image_path").fileinput({
previewFileType: "image", previewFileType: "image",
@@ -148,7 +148,7 @@ $(document).ready(function() {
'</div>\n', '</div>\n',
} }
}); });
$("#commissioner_image_path").fileinput({ $("#commissioner_image_path").fileinput({
previewFileType: "image", previewFileType: "image",
allowedFileExtensions: ["jpg", "gif", "png"], allowedFileExtensions: ["jpg", "gif", "png"],
@@ -167,7 +167,7 @@ $(document).ready(function() {
' <img src="{data}" class="file-preview-image" title="{caption}" alt="{caption}" style="width: 200px;height: 200px;">\n' + ' <img src="{data}" class="file-preview-image" title="{caption}" alt="{caption}" style="width: 200px;height: 200px;">\n' +
'</div>\n', '</div>\n',
} }
}); });
$("#employee_image_path").fileinput({ $("#employee_image_path").fileinput({
previewFileType: "image", previewFileType: "image",
@@ -187,7 +187,7 @@ $(document).ready(function() {
' <img src="{data}" class="file-preview-image" title="{caption}" alt="{caption}" style="width: 200px;height: 200px;">\n' + ' <img src="{data}" class="file-preview-image" title="{caption}" alt="{caption}" style="width: 200px;height: 200px;">\n' +
'</div>\n', '</div>\n',
} }
}); });
$("#shop_image").fileinput({ $("#shop_image").fileinput({
previewFileType: "image", previewFileType: "image",
@@ -227,7 +227,7 @@ $(document).ready(function() {
' <img src="{data}" class="file-preview-image" title="{caption}" alt="{caption}" style="width: 200px;height: 200px;">\n' + ' <img src="{data}" class="file-preview-image" title="{caption}" alt="{caption}" style="width: 200px;height: 200px;">\n' +
'</div>\n', '</div>\n',
} }
}); });
// first input focus for all form // first input focus for all form
$('form:first *input[data-behaviour!=datepicker]:input[type!=hidden]:first').focus(); $('form:first *input[data-behaviour!=datepicker]:input[type!=hidden]:first').focus();
@@ -252,4 +252,4 @@ Chart.scaleService.updateScaleDefaults('linear', {
} }
} }
}); });
/* chartkick js YAxis value override */ /* chartkick js YAxis value override */

5
app/views/foodcourt/addorders/detail.html.erb
View File

@@ -93,7 +93,7 @@
<li class="nav-item product" data-ref="<%= foodcourt_get_all_product_path %>"> <li class="nav-item product" data-ref="<%= foodcourt_get_all_product_path %>">
<a class="nav-link" data-toggle="tab" href="" role="tab">Products</a> <a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
</li> </li>
<%end%> <%end%>
</ul> </ul>
</div> </div>
</div> </div>
@@ -472,8 +472,9 @@ function getAllMenu(){
localStorage.setItem("menus", menus); localStorage.setItem("menus", menus);
if (result != null ) { if (result != null ) {
menu_cache_append(result); menu_cache_append(result);
$( "#loading_wrapper").hide(); $("#loading_wrapper").hide();
$("#oqs_loading_wrapper").css("display", "none"); $("#oqs_loading_wrapper").css("display", "none");
$(".page-loader-wrapper").css("display", "none");
} }
} }
}); });