Code style and performance fixes

This commit is contained in:
NGPixel
2016-10-17 19:52:04 -04:00
parent 847c81946a
commit 9454065ab9
12 changed files with 57 additions and 54 deletions

View File

@@ -8,6 +8,27 @@ codeEditor.setOption('wrap', true);
let modelist = ace.require("ace/ext/modelist");
// ACE - Mode Loader
let modelistLoaded = [];
let loadAceMode = (m) => {
return $.ajax({
url: '/js/ace/mode-' + m + '.js',
dataType: "script",
cache: true,
beforeSend: () => {
if(_.includes(modelistLoaded, m)) {
return false;
}
},
success: () => {
modelistLoaded.push(m);
}
});
};
// Vue Code Block instance
let vueCodeBlock = new Vue({
el: '#modal-editor-codeblock',
data: {
@@ -39,23 +60,4 @@ let vueCodeBlock = new Vue({
}
}
});
// ACE - Mode Loader
let modelistLoaded = [];
let loadAceMode = (m) => {
return $.ajax({
url: '/js/ace/mode-' + m + '.js',
dataType: "script",
cache: true,
beforeSend: () => {
if(_.includes(modelistLoaded, m)) {
return false;
}
},
success: () => {
modelistLoaded.push(m);
}
});
}
});

View File

@@ -186,7 +186,7 @@ let vueImage = new Vue({
vueImage.isLoadingText = 'Moving image...';
vueImage.isLoading = true;
Vue.nextTick(() => {
socket.emit('uploadsMoveFile', { uid: uid, folder: fld }, (data) => {
socket.emit('uploadsMoveFile', { uid, folder: fld }, (data) => {
if(data.ok) {
vueImage.loadImages();
} else {
@@ -311,7 +311,7 @@ let vueImage = new Vue({
position: (opt, x, y) => {
$(opt.$trigger).addClass('is-contextopen');
let trigPos = $(opt.$trigger).position();
let trigDim = { w: $(opt.$trigger).width() / 2, h: $(opt.$trigger).height() / 2 }
let trigDim = { w: $(opt.$trigger).width() / 2, h: $(opt.$trigger).height() / 2 };
opt.$menu.css({ top: trigPos.top + trigDim.h, left: trigPos.left + trigDim.w });
},
events: {
@@ -370,7 +370,7 @@ $('#btn-editor-uploadimage input').on('change', (ev) => {
vueImage.isLoading = true;
},
progress: function(progress) {
progress: (progress) => {
vueImage.isLoadingText = 'Uploading...' + Math.round(progress) + '%';
},
@@ -398,7 +398,7 @@ $('#btn-editor-uploadimage input').on('change', (ev) => {
}
},
error: function(error) {
error: (error) => {
alerts.pushError(error.message, this.upload.file.name);
},

View File

@@ -10,7 +10,7 @@ if($('#mk-editor').length === 1) {
Vue.filter('filesize', (v) => {
return _.toUpper(filesize(v));
})
});
//=include editor-image.js
//=include editor-codeblock.js
@@ -170,26 +170,26 @@ if($('#mk-editor').length === 1) {
}
});
}
//-> Save
//-> Save
$('.btn-edit-save, .btn-create-save').on('click', (ev) => {
$('.btn-edit-save, .btn-create-save').on('click', (ev) => {
$.ajax(window.location.href, {
data: {
markdown: mde.value()
},
dataType: 'json',
method: 'PUT'
}).then((rData, rStatus, rXHR) => {
if(rData.ok) {
window.location.assign('/' + pageEntryPath);
} else {
alerts.pushError('Something went wrong', rData.error);
}
}, (rXHR, rStatus, err) => {
alerts.pushError('Something went wrong', 'Save operation failed.');
});
$.ajax(window.location.href, {
data: {
markdown: mde.value()
},
dataType: 'json',
method: 'PUT'
}).then((rData, rStatus, rXHR) => {
if(rData.ok) {
window.location.assign('/' + pageEntryPath);
} else {
alerts.pushError('Something went wrong', rData.error);
}
}, (rXHR, rStatus, err) => {
alerts.pushError('Something went wrong', 'Save operation failed.');
});
});
}