Add config.param_sep option to JS files

This commit is contained in:
Sommerregen
2015-08-08 17:41:53 +02:00
parent 0165f53d44
commit fa8db3dd90
4 changed files with 16 additions and 10 deletions

View File

@@ -123,13 +123,14 @@ $(function () {
$(this).attr('disabled','disabled').find('> .fa').removeClass('fa-cloud-download').addClass('fa-refresh fa-spin'); $(this).attr('disabled','disabled').find('> .fa').removeClass('fa-cloud-download').addClass('fa-refresh fa-spin');
var url = $(this).data('maintenanceUpdate'); var url = $(this).data('maintenanceUpdate');
var task = 'task' + GravAdmin.config.param_sep;
GravAjax({ GravAjax({
dataType: "json", dataType: "json",
url: url, url: url,
toastErrors: true, toastErrors: true,
success: function(result, status) { success: function(result, status) {
if (url.indexOf('task:updategrav') !== -1) { if (url.indexOf(task + 'updategrav') !== -1) {
if (result.status == 'success') { if (result.status == 'success') {
$('[data-gpm-grav]').remove(); $('[data-gpm-grav]').remove();
toastr.success(result.message + window.grav_available_version); toastr.success(result.message + window.grav_available_version);
@@ -181,6 +182,7 @@ $(function () {
url: url, url: url,
toastErrors: true, toastErrors: true,
success: function(result, status) { success: function(result, status) {
var task = 'task' + GravAdmin.config.param_sep;
var toastrBackup = {}; var toastrBackup = {};
if (result.toastr) { if (result.toastr) {
@@ -198,7 +200,7 @@ $(function () {
} }
} }
if (url.indexOf('task:backup') !== -1) { if (url.indexOf(task + 'backup') !== -1) {
//Reset backup days count //Reset backup days count
$('.backups-chart .numeric').html("0 <em>days</em>"); $('.backups-chart .numeric').html("0 <em>days</em>");
@@ -255,13 +257,14 @@ $(function () {
success: function (response) { success: function (response) {
var grav = response.payload.grav, var grav = response.payload.grav,
installed = response.payload.installed, installed = response.payload.installed,
resources = response.payload.resources; resources = response.payload.resources,
task = 'task' + GravAdmin.config.param_sep;
// grav updatable // grav updatable
if (grav.isUpdatable) { if (grav.isUpdatable) {
var icon = '<i class="fa fa-bullhorn"></i> '; var icon = '<i class="fa fa-bullhorn"></i> ';
content = 'Grav <b>v{available}</b> is now available! <span class="less">(Current: v{version})</span> ', content = 'Grav <b>v{available}</b> is now available! <span class="less">(Current: v{version})</span> ',
button = '<button data-maintenance-update="' + GravAdmin.config.base_url_relative + '/update.json/task:updategrav" class="button button-small secondary" id="grav-update-button">Update Grav Now</button>'; button = '<button data-maintenance-update="' + GravAdmin.config.base_url_relative + '/update.json/' + task + 'updategrav" class="button button-small secondary" id="grav-update-button">Update Grav Now</button>';
if (grav.isSymlink) { if (grav.isSymlink) {
button = '<span class="hint--left" style="float: right;" data-hint="Grav is symbolically linked. Upgrade won\'t be available."><i class="fa fa-fw fa-link"></i></span>'; button = '<span class="hint--left" style="float: right;" data-hint="Grav is symbolically linked. Upgrade won\'t be available."><i class="fa fa-fw fa-link"></i></span>';
@@ -293,7 +296,7 @@ $(function () {
var length, var length,
icon = '<i class="fa fa-bullhorn"></i>', icon = '<i class="fa fa-bullhorn"></i>',
content = '{updates} of your {type} have an <strong>update available</strong>', content = '{updates} of your {type} have an <strong>update available</strong>',
button = '<a href="{location}/task:update" class="button button-small secondary">Update {Type}</a>', button = '<a href="{location}/' + task + 'update" class="button button-small secondary">Update {Type}</a>',
plugins = $('.grav-update.plugins'), plugins = $('.grav-update.plugins'),
themes = $('.grav-update.themes'), themes = $('.grav-update.themes'),
sidebar = {plugins: $('#admin-menu a[href$="/plugins"]'), themes: $('#admin-menu a[href$="/themes"]')}; sidebar = {plugins: $('#admin-menu a[href$="/plugins"]'), themes: $('#admin-menu a[href$="/themes"]')};

View File

@@ -36,7 +36,8 @@
].join(''); ].join('');
var MDEditor = function(editor, options){ var MDEditor = function(editor, options){
var tpl = template, $this = this; var tpl = template, $this = this,
task = 'task' + GravAdmin.config.param_sep;
this.defaults = { this.defaults = {
markdown : false, markdown : false,
@@ -93,7 +94,7 @@
if ($(this).hasClass('grav-mdeditor-button-preview')) { if ($(this).hasClass('grav-mdeditor-button-preview')) {
GravAjax({ GravAjax({
dataType: 'JSON', dataType: 'JSON',
url: $this.element.data('grav-urlpreview') + '/task:processmarkdown', url: $this.element.data('grav-urlpreview') + '/' + task + 'processmarkdown',
method: 'post', method: 'post',
data: $this.element.parents('form').serialize(), data: $this.element.parents('form').serialize(),
toastErrors: true, toastErrors: true,

View File

@@ -76,6 +76,7 @@ $(function(){
restoreStates(); restoreStates();
var startFilterPages = function () { var startFilterPages = function () {
var task = 'task' + GravAdmin.config.param_sep;
$('input[name="page-search"]').focus(); $('input[name="page-search"]').focus();
var flags = $('input[name="page-filter"]').val(), var flags = $('input[name="page-filter"]').val(),
@@ -89,7 +90,7 @@ $(function(){
GravAjax({ GravAjax({
dataType: 'json', dataType: 'json',
method: 'POST', method: 'POST',
url: GravAdmin.config.base_url_relative + '/pages-filter.json/task:filterPages', url: GravAdmin.config.base_url_relative + '/pages-filter.json/' + task + 'filterPages',
data: { data: {
flags: flags, flags: flags,
query: query query: query

View File

@@ -1,6 +1,7 @@
<script type="text/javascript"> <script type="text/javascript">
window.GravAdmin = window.GravAdmin || {}; window.GravAdmin = window.GravAdmin || {};
window.GravAdmin.config = { window.GravAdmin.config = {
base_url_relative: '{{ base_url_relative }}' base_url_relative: '{{ base_url_relative }}',
param_sep: '{{ config.system.param_sep }}'
}; };
</script> </script>