Fixup merge

This commit is contained in:
Dane Everitt 2017-04-20 17:26:20 -04:00
parent 8d24e5f168
commit c8f1335a09
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
12 changed files with 13 additions and 589 deletions

View file

@ -55,20 +55,9 @@
<div class="box-body no-padding">
<div id="editor_install"style="height:300px">{{ $option->script_install }}</div>
</div>
</div>
</div>
<div class="col-xs-12">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">Upgrade Script</h3>
</div>
<div class="box-body no-padding">
<div id="editor_upgrade"style="height:300px">{{ $option->script_upgrade }}</div>
</div>
<div class="box-footer">
{!! csrf_field() !!}
<textarea name="script_install" class="hidden"></textarea>
<textarea name="script_upgrade" class="hidden"></textarea>
<button type="submit" class="btn btn-primary btn-sm pull-right">Save Scripts</button>
</div>
</div>
@ -79,13 +68,11 @@
@section('footer-scripts')
@parent
{!! Theme::js('js/vendor/ace/ace.js') !!}
{!! Theme::js('js/vendor/ace/ext-modelist.js') !!}
{!! Theme::js('vendor/ace/ace.js') !!}
{!! Theme::js('vendor/ace/ext-modelist.js') !!}
<script>
$(document).ready(function () {
const InstallEditor = ace.edit('editor_install');
const UpgradeEditor = ace.edit('editor_upgrade');
const Modelist = ace.require('ace/ext/modelist')
InstallEditor.setTheme('ace/theme/chrome');
@ -93,15 +80,10 @@
InstallEditor.getSession().setUseWrapMode(true);
InstallEditor.setShowPrintMargin(false);
UpgradeEditor.setTheme('ace/theme/chrome');
UpgradeEditor.getSession().setMode('ace/mode/sh');
UpgradeEditor.getSession().setUseWrapMode(true);
UpgradeEditor.setShowPrintMargin(false);
$('form').on('submit', function (e) {
$('textarea[name="script_install"]').val(InstallEditor.getValue());
$('textarea[name="script_upgrade"]').val(UpgradeEditor.getValue());
});
});
</script>
@endsection