DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Disable select2 on ios. It's terribly slow, doesn't register click events, and has forces focus to the search bar by default (which makes the keyboard popup and take over the screen. The latter issue might justify disabling it for all mobile devices, but the performance issues certainly justify it on iOS.

Browse source
This commit is contained in:
Daniel Meltzer 2016-06-09 20:31:23 -05:00
parent c91c1f92cd
commit 25c10c43dd
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/views/components/checkout.blade.php
View file

@ -46,7 +46,7 @@
<label for="asset_id" class="col-md-3 control-label">{{ trans('admin/hardware/form.checkout_to') }} <label for="asset_id" class="col-md-3 control-label">{{ trans('admin/hardware/form.checkout_to') }}
<i class='icon-asterisk'></i></label> <i class='icon-asterisk'></i></label>
<div class="col-md-9"> <div class="col-md-9">
{{ Form::select('asset_id', $assets_list , Input::old('asset_id', $component->asset_id), array('class'=>'select2', 'style'=>'min-width:100%')) }} {{ Form::select('asset_id', $assets_list , Input::old('asset_id', $component->asset_id), array('class'=>'select2', 'style'=>'width:100%')) }}
{!! $errors->first('asset_id', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!} {!! $errors->first('asset_id', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
</div> </div>
</div> </div>

8
resources/views/hardware/edit.blade.php
View file

@ -68,10 +68,10 @@
</label> </label>
<div class="col-md-7 col-sm-10"> <div class="col-md-7 col-sm-10">
@if (isset($selected_model)) @if (isset($selected_model))
{{ Form::select('model_id', $model_list , $selected_model->id, array('class'=>'select2 model', 'style'=>'min-width:100%','id' =>'model_select_id')) }} {{ Form::select('model_id', $model_list , $selected_model->id, array('class'=>'select2 model', 'style'=>'width:100%','id' =>'model_select_id')) }}
@else @else
{{ Form::select('model_id', $model_list , Input::old('model_id', $asset->model_id), array('class'=>'select2 model', 'style'=>'min-width:100%','id' =>'model_select_id')) }} {{ Form::select('model_id', $model_list , Input::old('model_id', $asset->model_id), array('class'=>'select2 model', 'style'=>'width:100%','id' =>'model_select_id')) }}
@endif @endif
<!-- onclick="return dependency('model')" --> <!-- onclick="return dependency('model')" -->
@ -158,7 +158,7 @@
<div class="col-md-3 control-label">{{ Form::label('company_id', trans('general.company')) }}</div> <div class="col-md-3 control-label">{{ Form::label('company_id', trans('general.company')) }}</div>
<div class="col-md-7 col-sm-12"> <div class="col-md-7 col-sm-12">
{{ Form::select('company_id', $company_list , Input::old('company_id', $asset->company_id), {{ Form::select('company_id', $company_list , Input::old('company_id', $asset->company_id),
['class'=>'select2', 'style'=>'min-width:100%']) }} ['class'=>'select2', 'style'=>'width:100%']) }}
{!! $errors->first('company_id', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!} {!! $errors->first('company_id', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
</div> </div>
</div> </div>
@ -181,7 +181,7 @@
<div class="form-group {{ $errors->has('supplier_id') ? ' has-error' : '' }}"> <div class="form-group {{ $errors->has('supplier_id') ? ' has-error' : '' }}">
<label for="supplier_id" class="col-md-3 control-label">{{ trans('admin/hardware/form.supplier') }}</label> <label for="supplier_id" class="col-md-3 control-label">{{ trans('admin/hardware/form.supplier') }}</label>
<div class="col-md-7 col-sm-11"> <div class="col-md-7 col-sm-11">
{{ Form::select('supplier_id', $supplier_list , Input::old('supplier_id', $asset->supplier_id), array('class'=>'select2', 'style'=>'min-width:100%','id'=>'supplier_select_id')) }} {{ Form::select('supplier_id', $supplier_list , Input::old('supplier_id', $asset->supplier_id), array('class'=>'select2', 'style'=>'width:100%','id'=>'supplier_select_id')) }}
{!! $errors->first('supplier_id', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!} {!! $errors->first('supplier_id', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
</div> </div>

6
resources/views/layouts/default.blade.php
View file

@ -560,7 +560,11 @@
<script> <script>
$(function () { $(function () {
//Initialize Select2 Elements //Initialize Select2 Elements
$(".select2").select2(); var iOS = /iPhone|iPad|iPod/.test(navigator.userAgent) && !window.MSStream;
if(!iOS)
{
$(".select2").select2();
}
$('.datepicker').datepicker(); $('.datepicker').datepicker();
}); });