andy/Saxonite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v1.0.9.0

Browse Source
This commit is contained in:
andy
2021-06-22 10:05:59 +01:00
parent 558be9063f
commit e40ff8a7f2
50 changed files with 899 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SaxoniteCoreWebOnline/wwwroot/js/sax-account.js
+6 -5
View File
@@ -5,6 +5,7 @@
(function (win, doc, undef)
{
"use strict";
sax.classFileDrag = 'sax-file-drag';
sax.profile = { contact: {}, sports: {}, organisations: {} };
//--------------------------------------------------------------
@@ -106,7 +107,7 @@
}
sax.onDropContactImageFile = function (file, context)
{
//sax.debug('onDropContactImageFile', file);
//sax.debug('onDropContactImageFile', file, context);
if (file.size > sax.maxProfileImageSize) return sax.doAlert(sax.dlg.title.imageUpload, sax.msg.uploadFileSizeMax.format(sax.formatFileSize(sax.maxProfileImageSize)));
if (file.type != 'image/jpg' && file.type != 'image/jpeg' && file.type != 'image/png') return sax.doAlert(sax.dlg.title.imageUpload, sax.msg.uploadFileTypeInvalid.format(sax.getFileType(file)));
$(".UploadMessage", context).text(sax.msg.uploadingFile.format(file.name));
@@ -123,7 +124,7 @@
sax.handleContactImageUploadResponse = function (response)
{
let context = sax.data.contactImageUploadContext;
sax.debug('handleContactImageUploadResponse', response, context);
//sax.debug('handleContactImageUploadResponse', response, context);
if (!response) return;
var $section = $('.sax-panel-section.ProfileContact');
sax.refreshControlValues(response.controlValues, context);
@@ -340,9 +341,9 @@
sax.$pnl.contactImageDrag = $('#pnlContactImageDrop')
.on("dragenter", function (evt) { sax.haltEvent(evt); })
.on("dragover", function (evt) { sax.haltEvent(evt); if (!sax.$pnl.contactImageDrag.hasClass('sax-dragging')) sax.$pnl.contactImageDrag.addClass('sax-dragging'); })
.on("dragleave", function (evt) { sax.haltEvent(evt); sax.$pnl.contactImageDrag.removeClass('sax-dragging'); })
.on("drop", function (evt) { sax.haltEvent(evt); sax.$pnl.contactImageDrag.removeClass('sax-dragging'); sax.onDropContactImage(evt); });
.on("dragover", function (evt) { sax.haltEvent(evt); if (!sax.$pnl.contactImageDrag.hasClass(sax.classFileDrag)) sax.$pnl.contactImageDrag.addClass(sax.classFileDrag); })
.on("dragleave", function (evt) { sax.haltEvent(evt); sax.$pnl.contactImageDrag.removeClass(sax.classFileDrag); })
.on("drop", function (evt) { sax.haltEvent(evt); sax.$pnl.contactImageDrag.removeClass(sax.classFileDrag); sax.onDropContactImage(evt); });
$('.sax-panel-section.ProfileSports .sax-action.sax-add').on('click', function (evt) { sax.addProfileSport(); });
var opt = sax.dlgOpts();
SaxoniteCoreWebOnline/wwwroot/js/sax-home.js
+14 -4
View File
@@ -23,7 +23,7 @@
}
sax.doRefreshResults = function (response)
{
sax.debug('doRefreshResults', response);
//sax.debug('doRefreshResults', response);
delete sax.awaitingRefreshResponse;
var $results = $('.sax-panel-results');
var $msgs = $('.sax-panel-messages', $results).hide().empty();
@@ -69,7 +69,7 @@
let $frm = $('#frmActivityId');
$('.ActivityType', $frm).val(item.itemType);
$('.ActivityIdx', $frm).val(item.itemIdx);
sax.activity = { item:item, $item: $item };
sax.activity = { item: item, $item: $item };
sax.ajax.activityInfo = sax.ajax.activityInfo || { url: sax.url.base + 'Activity/Ajax/GetInfo', formId: 'frmActivityId', callbackFn: sax.showActivityDetails, noWaitIcon: true };
sax.doAjaxRequest(sax.ajax.activityInfo, 50);
}
@@ -81,14 +81,24 @@
if (item = response.article)
{
let $itm = $('.sax-panel-item-template .sax-panel-item.Article').clone();
let $segs = $('.ArticleContentSegments', $itm);
$('.ArticleHeadline', $itm).text(item.headline);
$('.ArticleSummary', $itm).text(item.summary).toggle(!!item.summary);
let segs = item.content.segments;
for (let segIdx = 0; segIdx < segs.length; segIdx++)
{
let seg = segs[segIdx];
let $seg = $('.sax-panel-item-template .sax-panel-item.ArticleContentSegment').clone().html(seg.body.html);
$('.ArticleContentSegments', $itm).append($seg);
if (seg.body)
{
let $seg = $('.sax-panel-item-template .sax-panel-item.ArticleContentSegment').clone().html(seg.body.html);
$seg.appendTo($segs);
}
if (seg.image)
{
let $seg = $('.sax-panel-item-template .sax-panel-item.ArticleContentSegmentImage').clone();
$('img', $seg).prop('src', seg.image.link);
$seg.appendTo($segs);
}
}
$act.append($itm);
}
SaxoniteCoreWebOnline/wwwroot/js/sax-jrn-art.js
+147 -50
View File
@@ -7,6 +7,7 @@
"use strict";
sax.itemIdPrefix = 'Itm_';
sax.segIdPrefix = 'Seg_';
sax.classFileDrag = 'sax-file-drag';
let ac = sax.articleContent = sax.articleContent || {};
//--------------------------------------------------------------
@@ -68,16 +69,16 @@
}
sax.populateArticleContent = function (content)
{
sax.debug('populateArticleContent', content);
//sax.debug('populateArticleContent', content);
ac.$segList.empty();
ac.segIdx = 0;
let segments = content.segments || [{}];
if (!segments.length) segments.push({});
let segments = content.segments || [];
if (!segments.length) segments.push({ body: {}});
for (let segIdx = 0; segIdx < segments.length; segIdx++)
sax.addContentSegment(segments[segIdx]);
}
sax.addContentSegment = function (seg)
sax.addContentSegment = function (seg, idxAfter, idxBefore)
{
let idx = ++ac.segIdx;
let segId = sax.segmentId(idx);
@@ -86,57 +87,90 @@
return;
}
let $seg = $('.sax-panel-item-template .sax-panel-item.ArticleSegment', ac.$content).clone().prop('id', segId)
let segBody = seg.body || {};
$('.sax-article-segment', $seg).html(segBody.html);
$('input.ArticleContentSegment', $seg).val(segBody.html);
ac.$segList.append($seg);
$('.sax-action.sax-add', $seg).on('click', function () { sax.addContentSegment({}, idx); });
if (seg.body)
{
$('.sax-article-segment-body', $seg).html(seg.body.html);
$('input.ArticleContentSegmentBody', $seg).val(seg.body.html);
}
else if (seg.image)
{
$seg.addClass("ArticleImage");
$('input.ArticleContentSegmentItemImageId', $seg).val(seg.image.itemImageId);
$('input.ArticleContentSegmentImageIdx', $seg).val(seg.image.imageIdx);
$('.sax-article-segment-image', $seg).show().find('img').prop('src', seg.image.imageLink);
$('.sax-action.sax-add-image', $seg).hide();
}
$('.sax-action.sax-add', $seg).on('click', function () { sax.addContentSegment({ body: {} }, idx); });
$('.sax-action.sax-add-image', $seg).on('click', function () { sax.selectArticleImage(idx); });
$('.sax-action.sax-up', $seg).on('click', function () { sax.moveUpContentSegment(idx); });
$('.sax-action.sax-down', $seg).on('click', function () { sax.moveDownContentSegment(idx); });
$('.sax-action.sax-delete', $seg).on('click', function () { sax.deleteContentSegment(idx); });
tinymce.init({
branding: false,
elementpath: true,
menubar: false,
inline: true,
//skin: 'small',
//icons: 'small',
selector: '#' + segId + ' .sax-article-segment',
setup: function (ed)
{
ed.on('blur', function (e)
let $segAfter = $('#' + sax.segmentId(idxAfter));
let $segBefore = $('#' + sax.segmentId(idxBefore));
if ($segAfter.length) $seg.insertAfter($segAfter);
else if ($segBefore.length) $seg.insertBefore($segBefore);
else ac.$segList.append($seg);
if (seg.body)
{
tinymce.init({
branding: false,
elementpath: true,
menubar: false,
inline: true,
//skin: 'small',
//icons: 'small',
selector: '#' + segId + ' .sax-article-segment-body',
setup: function (ed)
{
let ed = tinymce.get(e.target.id);
let $ed = $('#' + ed.id);
let $seg = $ed.closest('.sax-panel-item.ArticleSegment');
$(".sax-article-segment p", $seg).each(function (i,el) { if ($.trim($(el).text()) == "") { $(el).remove(); } });
let $inp = $seg.find('input.ArticleContentSegment').val(ed.getContent());
sax.debug('blur Id: ' + e.target.id + '. Val: ' + $inp.val());
});
},
/*
plugins: [
//'link',
'lists',
//'powerpaste',
//'autolink',
//'tinymcespellchecker'
],
//powerpaste_word_import: 'clean',
//powerpaste_html_import: 'clean',
*/
toolbar: [
'undo redo | bold italic underline | fontselect fontsizeselect',
'forecolor backcolor | alignleft aligncenter alignright alignfull | numlist bullist outdent indent'
],
valid_elements: 'p[style],strong,em,span[style],a[href],ul,ol,li',
valid_styles: { '*': 'font-size,font-family,color,text-decoration,text-align' },
});
ed.on('focus', function (e)
{
ed.notificationManager.close();
});
ed.on('blur', function (e)
{
let ed = tinymce.get(e.target.id);
let $ed = $('#' + ed.id);
let $seg = $ed.closest('.sax-panel-item.ArticleSegment');
$(".sax-article-segment-body p", $seg).each(function (i, el) { if ($.trim($(el).text()) == "") { $(el).remove(); } });
let $inp = $seg.find('input.ArticleContentSegmentBody').val(ed.getContent());
//sax.debug('blur Id: ' + e.target.id + '. Val: ' + $inp.val());
});
},
plugins: [
//'paste image'
//'link',
//'lists',
//'powerpaste',
//'autolink',
//'tinymcespellchecker'
],
//paste_block_drop: true,
//powerpaste_block_drop: true,
/*
//powerpaste_word_import: 'clean',
//powerpaste_html_import: 'clean',
*/
toolbar: [
'undo redo | bold italic underline | fontselect fontsizeselect',
'forecolor backcolor | alignleft aligncenter alignright alignfull | numlist bullist outdent indent'
],
valid_elements: 'p[style],strong,em,span[style],a[href],ul,ol,li',
valid_styles: { '*': 'font-size,font-family,color,background-color,text-decoration,text-align' },
});
$seg.dragCount = 0;
$seg
.on("dragenter", function (evt) { $seg.dragCount++; sax.haltEvent(evt); })
.on("dragover", function (evt) { sax.haltEvent(evt); if (!$seg.hasClass(sax.classFileDrag)) $seg.addClass(sax.classFileDrag); })
.on("dragleave", function (evt) { $seg.dragCount--; sax.haltEvent(evt); if (!$seg.dragCount) $seg.removeClass(sax.classFileDrag); })
.on("drop", function (evt) { sax.haltEvent(evt); $seg.removeClass(sax.classFileDrag); sax.onDropArticleImage(evt, idx, $seg); });
}
}
sax.moveUpContentSegment = function (idx)
{
sax.debug('moveUpContentSegment(' + idx + ')');
//sax.debug('moveUpContentSegment(' + idx + ')');
let segId = sax.segmentId(idx);
let $segPrev;
$('.sax-panel-item.ArticleSegment', ac.$segList).detach().each(
@@ -154,7 +188,7 @@
}
sax.moveDownContentSegment = function (idx)
{
sax.debug('moveDownContentSegment(' + idx + ')');
//sax.debug('moveDownContentSegment(' + idx + ')');
let segId = sax.segmentId(idx);
let $segMove;
let $segs = $('.sax-panel-item.ArticleSegment', ac.$segList).detach();
@@ -169,13 +203,71 @@
}
ac.$segList.append($seg);
if ($segMove) $segMove.insertAfter($seg);
$segMove = null;
});
}
sax.deleteContentSegment = function (idx)
{
sax.debug('deleteContentSegment(' + idx + ')');
//sax.debug('deleteContentSegment(' + idx + ')');
if ($('.sax-panel-item.ArticleSegment', ac.$segList).length < 2) return;
$('#' + sax.segmentId(idx)).remove();
sax.confirmItemRemove(function () { $('#' + sax.segmentId(idx)).remove(); });
}
sax.selectArticleImage = function (idx)
{
let $dlg = sax.$dlg.selectArticleImage.dialog('option', { title: sax.dlg.title.imageUpload });
$('input.SegmentIdx', $dlg).val(idx);
$('#ifArticleImage', $dlg).val('');
sax.openDialog($dlg, 560, 240);
}
sax.uploadArticleImage = function ()
{
let $dlg = sax.$dlg.selectArticleImage;
let $fileCtrl = $('#ifArticleImage', $dlg);
if (!$fileCtrl.length || !$fileCtrl[0].files.length)
return sax.doAlert(sax.dlg.title.imageUpload, sax.msg.uploadFileSelect);
let file = $fileCtrl[0].files[0];
sax.onDropArticleImageFile(file, $('input.SegmentIdx', $dlg).val(), $dlg);
}
sax.onDropArticleImage = function (evt, idx, $seg)
{
//sax.debug('onDropArticleImage');
let files = evt.originalEvent.dataTransfer.files;
if (files.length < 1) return;
if (files.length > 1) return sax.doAlert(sax.dlg.title.imageUpload, sax.msg.uploadImageSingle);
sax.onDropArticleImageFile(files[0], idx, $('#frmArticle'));
}
sax.onDropArticleImageFile = function (file, idx, context)
{
//sax.debug('onDropArticleImageFile', file, context);
ac.segIdxAddImage = idx;
if (file.size > sax.maxProfileImageSize) return sax.doAlert(sax.dlg.title.imageUpload, sax.msg.uploadFileSizeMax.format(sax.formatFileSize(sax.maxProfileImageSize)));
if (file.type != 'image/jpg' && file.type != 'image/jpeg' && file.type != 'image/png') return sax.doAlert(sax.dlg.title.imageUpload, sax.msg.uploadFileTypeInvalid.format(sax.getFileType(file)));
$(".UploadMessage", context).text(sax.msg.uploadingFile.format(file.name));
$('img.ArticleImageUploadProgress', context).fadeIn(200);
sax.clearControlError(sax.$pnl.contactImageDrag);
sax.data.contactImageUploadContext = context;
sax.ajax.uploadArticleImage = sax.ajax.uploadArticleImage || { url: sax.url.base + 'Journalist/Ajax/UploadArticleImage', callbackFn: sax.handleArticleImageUploadResponse, noWaitIcon: true };
sax.ajax.uploadArticleImage.formData = new FormData();
sax.ajax.uploadArticleImage.formData.append("__RequestVerificationToken", $('#frmNavigate input[name="__RequestVerificationToken"]').val());
sax.ajax.uploadArticleImage.formData.append("ArticleId", $('#ifArticleId', sax.$frm.article).val());
sax.ajax.uploadArticleImage.formData.append("ArticleImage", file);
sax.doAjaxRequest(sax.ajax.uploadArticleImage, 50);
}
sax.handleArticleImageUploadResponse = function (response)
{
let context = sax.data.contactImageUploadContext;
//sax.debug('handleArticleImageUploadResponse', response, context);
if (!response) return;
sax.refreshControlValues(response.controlValues, context);
$(".UploadMessage", context).empty();
$('img.ArticleImageUploadProgress', context).hide();
if (response.success && response.segment)
{
sax.addContentSegment(response.segment, 0, ac.segIdxAddImage);
delete ac.segIdxAddImage;
sax.$dlg.selectArticleImage.dialog('close');
}
}
//--------------------------------------------------------------
@@ -313,6 +405,11 @@
ac.$content = $('.sax-article-panel.sax-article-content');
ac.$segList = $('.sax-article-segment-list', ac.$content);
var opt = sax.dlgOpts();
opt.buttons[sax.dlg.btn.ok] = function () { sax.uploadArticleImage(); };
opt.buttons[sax.dlg.btn.cancel] = function () { $(this).dialog('close'); };
sax.$dlg.selectArticleImage = $('#dlgSelectArticleImage').dialog(opt);
setTimeout(sax.refreshResults, 250);
});
SaxoniteCoreWebOnline/wwwroot/js/sax-main.js
+18 -13
View File
@@ -68,7 +68,7 @@
evt.preventDefault();
evt.stopPropagation();
}
sax.debug = sax.debugMode ? window.console.log.bind(window.console) : function () { };
sax.debug = sax.debugMode ? win.console.log.bind(win.console) : function () { };
//--------------------------------------------------------------
sax.setOddDataRowClass = function (rowSel, cName)
@@ -152,10 +152,11 @@
// Dialogs.
sax.openDialog = function ($dlg, width, height)
{
let $win = $(win);
$dlg.dialog(
{
minWidth: null, maxWidth: null, width: Math.min(width || 400, $(window).width() * .90),
minHeight: null, maxHeight: null, height: Math.min(height || 320, $(window).innerHeight() * .90)
minWidth: null, maxWidth: null, width: Math.min(width || 400, $win.width() * .90),
minHeight: null, maxHeight: null, height: Math.min(height || 320, $win.innerHeight() * .96)
}).dialog('open');
return $dlg;
}
@@ -205,6 +206,10 @@
$('#dlgConfirmMsg').html(msg);
sax.openDialog(sax.$dlg.confirm);
}
sax.confirmItemRemove = function (fn)
{
sax.doConfirm('', sax.msg.itemRemoveConfirm, fn);
}
sax.doProgress = function (title, msg, delay)
{
if (!msg)
@@ -235,8 +240,8 @@
// Notifications.
sax.showNotification = function (title, msg)
{
window.clearTimeout(sax.toNotification);
var $win = $(window);
win.clearTimeout(sax.toNotification);
var $win = $(win);
var $not = $('#sax-notification').hide();
if (!$not.length)
{
@@ -255,7 +260,7 @@
}
sax.hideNotification = function ()
{
window.clearTimeout(sax.toNotification);
win.clearTimeout(sax.toNotification);
$('#sax-notification').slideUp(500);
}
sax.doPleaseWait = function ()
@@ -272,13 +277,13 @@
// Ajax.
sax.doAjaxRequest = function (ajax, delay)
{
window.clearTimeout(ajax.timeout);
win.clearTimeout(ajax.timeout);
if (!ajax.noWaitIcon) sax.doPleaseWait();
ajax.timeout = setTimeout(function () { sax.execAjaxRequest(ajax); }, Math.max(50, parseInt(delay || 0, 10)));
}
sax.execAjaxRequest = function (ajax)
{
window.clearTimeout(ajax.timeout);
win.clearTimeout(ajax.timeout);
if (ajax.request) ajax.request.abort();
var cfgAjax =
{
@@ -360,7 +365,7 @@
{
sax.session = sax.session || { refresh: {} };
let ssr = sax.session.refresh;
window.clearTimeout(ssr.timeout);
win.clearTimeout(ssr.timeout);
ssr.timeout = setTimeout(function () { sax.refreshSession(); }, 150000);
}
sax.refreshSession = function ()
@@ -383,12 +388,12 @@
}
sax.setControlError = function (sel, error)
{
var $ctrl = $(sel).closest('.sax-form-control').toggleClass('sax-error',!!error.length);
var $ctrl = $(sel).closest('.sax-form-control').toggleClass('sax-error', !!error.length);
$('.sax-message', $ctrl).text(error);
}
sax.refreshControlValues = function (controlValues, context)
{
var $frmCtrls = $('.sax-form-control',context).removeClass('sax-error');
var $frmCtrls = $('.sax-form-control', context).removeClass('sax-error');
sax.clearControlErrors();
var values = (controlValues || []);
var valuesLen = values.length;
@@ -461,11 +466,11 @@
if (viewport.is('xs')) $body.addClass('mob');
else if (viewport.current() != 'unrecognized') $body.addClass('dsk');
}
sax.isAutoHeight = function () { return ($(window).width() < 360 || $(window).height() < 560 || sax.isMob()); }
sax.isAutoHeight = function () { return ($(win).width() < 360 || $(win).height() < 560 || sax.isMob()); }
sax.onWinResizePage = function () { };
sax.onWinResize = function ()
{
var winH = $(window).height();
var winH = $(win).height();
var $pageBody = $('#sax-page-body');
var $hdr = $('#sax-page-header');
var $ftr = $('#sax-page-footer');