mirror of
https://github.com/Oreolek/ifhub.club.git
synced 2024-07-08 09:24:25 +03:00
jsmin ест маркеры
This commit is contained in:
parent
f13f642f79
commit
2e6be0a8de
|
@ -34,7 +34,7 @@ ls.blocks = (function ($) {
|
||||||
*/
|
*/
|
||||||
this.load = function(obj, block, params){
|
this.load = function(obj, block, params){
|
||||||
var id = $(obj).attr('id');
|
var id = $(obj).attr('id');
|
||||||
/*loadBefore*/ //-loadBefore
|
'*loadBefore*'; '*/loadBefore*';
|
||||||
|
|
||||||
if(!id) return;
|
if(!id) return;
|
||||||
|
|
||||||
|
|
|
@ -56,7 +56,7 @@ ls.hook = (function ($) {
|
||||||
var replaceFrom = /\{/m;
|
var replaceFrom = /\{/m;
|
||||||
var replaceTo = '{ ';
|
var replaceTo = '{ ';
|
||||||
if($.type(marker) == 'string'){
|
if($.type(marker) == 'string'){
|
||||||
replaceFrom = new RegExp('(/\\*'+marker+'\\*/)', 'm');
|
replaceFrom = new RegExp('(\'\\*'+marker+'\\*\'[\r\n\t ]*;?)', 'm');
|
||||||
replaceTo = '$1';
|
replaceTo = '$1';
|
||||||
}
|
}
|
||||||
if($.type(funcInj)=='function'){
|
if($.type(funcInj)=='function'){
|
||||||
|
|
|
@ -232,7 +232,7 @@ ls.tools = (function ($) {
|
||||||
var text =(BLOG_USE_TINYMCE) ? tinyMCE.activeEditor.getContent() : $('#'+textId).val();
|
var text =(BLOG_USE_TINYMCE) ? tinyMCE.activeEditor.getContent() : $('#'+textId).val();
|
||||||
var ajaxUrl = aRouter['ajax']+'preview/text/';
|
var ajaxUrl = aRouter['ajax']+'preview/text/';
|
||||||
var ajaxOptions = {text: text, save: save};
|
var ajaxOptions = {text: text, save: save};
|
||||||
/*textPreviewAjaxBefore*/ //-textPreviewAjaxBefore
|
'*textPreviewAjaxBefore*'; '*/textPreviewAjaxBefore*';
|
||||||
ls.ajax(ajaxUrl, ajaxOptions, function(result){
|
ls.ajax(ajaxUrl, ajaxOptions, function(result){
|
||||||
if (!result) {
|
if (!result) {
|
||||||
ls.msg.error('Error','Please try again later');
|
ls.msg.error('Error','Please try again later');
|
||||||
|
@ -243,10 +243,10 @@ ls.tools = (function ($) {
|
||||||
if (!divPreview) {
|
if (!divPreview) {
|
||||||
divPreview = 'text_preview';
|
divPreview = 'text_preview';
|
||||||
}
|
}
|
||||||
/*textPreviewDisplayBefore*/ //-textPreviewDisplayBefore
|
'*textPreviewDisplayBefore*'; '*/textPreviewDisplayBefore*';
|
||||||
if ($('#'+divPreview).length) {
|
if ($('#'+divPreview).length) {
|
||||||
$('#'+divPreview).html(result.sText);
|
$('#'+divPreview).html(result.sText);
|
||||||
/*textPreviewDisplayAfter*/ //-textPreviewDisplayAfter
|
'*textPreviewDisplayAfter*'; '*/textPreviewDisplayAfter*'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -365,7 +365,7 @@ ls = (function ($) {
|
||||||
* Загрузка изображения
|
* Загрузка изображения
|
||||||
*/
|
*/
|
||||||
this.ajaxUploadImg = function(form, sToLoad) {
|
this.ajaxUploadImg = function(form, sToLoad) {
|
||||||
/*ajaxUploadImgBefore*/ //-ajaxUploadImgBefore
|
'*ajaxUploadImgBefore*'; '*/ajaxUploadImgBefore*';
|
||||||
ls.ajaxSubmit('upload/image/',form,function(data){
|
ls.ajaxSubmit('upload/image/',form,function(data){
|
||||||
if (data.bStateError) {
|
if (data.bStateError) {
|
||||||
ls.msg.error(data.sMsgTitle,data.sMsg);
|
ls.msg.error(data.sMsgTitle,data.sMsg);
|
||||||
|
@ -373,7 +373,7 @@ ls = (function ($) {
|
||||||
$.markItUp({ replaceWith: data.sText} );
|
$.markItUp({ replaceWith: data.sText} );
|
||||||
$('#form_upload_img').find('input[type="text"], input[type="file"]').val('');
|
$('#form_upload_img').find('input[type="text"], input[type="file"]').val('');
|
||||||
$('#form_upload_img').jqmHide();
|
$('#form_upload_img').jqmHide();
|
||||||
/*ajaxUploadImgAfter*/ //-ajaxUploadImgAfter
|
'*ajaxUploadImgAfter*'; '*/ajaxUploadImgAfter*';
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,7 +34,7 @@ ls.blocks = (function ($) {
|
||||||
*/
|
*/
|
||||||
this.load = function(obj, block, params){
|
this.load = function(obj, block, params){
|
||||||
var id = $(obj).attr('id');
|
var id = $(obj).attr('id');
|
||||||
/*loadBefore*/ //-loadBefore
|
'*loadBefore*'; '*/loadBefore*';
|
||||||
|
|
||||||
if(!id) return;
|
if(!id) return;
|
||||||
|
|
||||||
|
|
|
@ -56,7 +56,7 @@ ls.hook = (function ($) {
|
||||||
var replaceFrom = /\{/m;
|
var replaceFrom = /\{/m;
|
||||||
var replaceTo = '{ ';
|
var replaceTo = '{ ';
|
||||||
if($.type(marker) == 'string'){
|
if($.type(marker) == 'string'){
|
||||||
replaceFrom = new RegExp('(/\\*'+marker+'\\*/)', 'm');
|
replaceFrom = new RegExp('(\'\\*'+marker+'\\*\'[\r\n\t ]*;?)', 'm');
|
||||||
replaceTo = '$1';
|
replaceTo = '$1';
|
||||||
}
|
}
|
||||||
if($.type(funcInj)=='function'){
|
if($.type(funcInj)=='function'){
|
||||||
|
|
|
@ -232,7 +232,7 @@ ls.tools = (function ($) {
|
||||||
var text =(BLOG_USE_TINYMCE) ? tinyMCE.activeEditor.getContent() : $('#'+textId).val();
|
var text =(BLOG_USE_TINYMCE) ? tinyMCE.activeEditor.getContent() : $('#'+textId).val();
|
||||||
var ajaxUrl = aRouter['ajax']+'preview/text/';
|
var ajaxUrl = aRouter['ajax']+'preview/text/';
|
||||||
var ajaxOptions = {text: text, save: save};
|
var ajaxOptions = {text: text, save: save};
|
||||||
/*textPreviewAjaxBefore*/ //-textPreviewAjaxBefore
|
'*textPreviewAjaxBefore*'; '*/textPreviewAjaxBefore*';
|
||||||
ls.ajax(ajaxUrl, ajaxOptions, function(result){
|
ls.ajax(ajaxUrl, ajaxOptions, function(result){
|
||||||
if (!result) {
|
if (!result) {
|
||||||
ls.msg.error('Error','Please try again later');
|
ls.msg.error('Error','Please try again later');
|
||||||
|
@ -243,10 +243,10 @@ ls.tools = (function ($) {
|
||||||
if (!divPreview) {
|
if (!divPreview) {
|
||||||
divPreview = 'text_preview';
|
divPreview = 'text_preview';
|
||||||
}
|
}
|
||||||
/*textPreviewDisplayBefore*/ //-textPreviewDisplayBefore
|
'*textPreviewDisplayBefore*'; '*/textPreviewDisplayBefore*';
|
||||||
if ($('#'+divPreview).length) {
|
if ($('#'+divPreview).length) {
|
||||||
$('#'+divPreview).html(result.sText);
|
$('#'+divPreview).html(result.sText);
|
||||||
/*textPreviewDisplayAfter*/ //-textPreviewDisplayAfter
|
'*textPreviewDisplayAfter*'; '*/textPreviewDisplayAfter*';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -365,7 +365,7 @@ ls = (function ($) {
|
||||||
* Загрузка изображения
|
* Загрузка изображения
|
||||||
*/
|
*/
|
||||||
this.ajaxUploadImg = function(form, sToLoad) {
|
this.ajaxUploadImg = function(form, sToLoad) {
|
||||||
/*ajaxUploadImgBefore*/ //-ajaxUploadImgBefore
|
'*ajaxUploadImgBefore*'; '*/ajaxUploadImgBefore*';
|
||||||
ls.ajaxSubmit('upload/image/',form,function(data){
|
ls.ajaxSubmit('upload/image/',form,function(data){
|
||||||
if (data.bStateError) {
|
if (data.bStateError) {
|
||||||
ls.msg.error(data.sMsgTitle,data.sMsg);
|
ls.msg.error(data.sMsgTitle,data.sMsg);
|
||||||
|
@ -373,7 +373,7 @@ ls = (function ($) {
|
||||||
$.markItUp({ replaceWith: data.sText} );
|
$.markItUp({ replaceWith: data.sText} );
|
||||||
$('#form_upload_img').find('input[type="text"], input[type="file"]').val('');
|
$('#form_upload_img').find('input[type="text"], input[type="file"]').val('');
|
||||||
$('#form_upload_img').jqmHide();
|
$('#form_upload_img').jqmHide();
|
||||||
/*ajaxUploadImgAfter*/ //-ajaxUploadImgAfter
|
'*ajaxUploadImgAfter*'; '*/ajaxUploadImgAfter*';
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue