mirror of
https://github.com/e107inc/e107.git
synced 2025-08-03 13:17:24 +02:00
Removed snippets from bootstrap3 theme. Fix for line-endings issue in cache tests.
This commit is contained in:
@@ -15,11 +15,14 @@
|
|||||||
|
|
||||||
init : function(ed,url) {
|
init : function(ed,url) {
|
||||||
|
|
||||||
var t = this, dialect = ed.getParam('bbcode_dialect', 'e107').toLowerCase();
|
var t = this;
|
||||||
|
|
||||||
|
console.log('Initializing e107 TinyMce Plugin');
|
||||||
|
|
||||||
|
ed.on('beforeSetContent', function(e)
|
||||||
|
{
|
||||||
|
e.content = t['_e107_bbcode2html'](e.content, url);
|
||||||
|
|
||||||
|
|
||||||
ed.on('beforeSetContent', function(e) {
|
|
||||||
e.content = t['_' + dialect + '_bbcode2html'](e.content, url);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
ed.on('change', function(e) {
|
ed.on('change', function(e) {
|
||||||
@@ -39,11 +42,11 @@
|
|||||||
// alert(e.content); // remove comment to test.
|
// alert(e.content); // remove comment to test.
|
||||||
|
|
||||||
if (e.set) {
|
if (e.set) {
|
||||||
e.content = t['_' + dialect + '_bbcode2html'](e.content, url);
|
e.content = t['_e107_bbcode2html'](e.content, url);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (e.get) {
|
if (e.get) {
|
||||||
e.content = t['_' + dialect + '_html2bbcode'](e.content, url);
|
e.content = t['_e107_html2bbcode'](e.content, url);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -79,7 +82,10 @@
|
|||||||
dataType: 'html',
|
dataType: 'html',
|
||||||
success: function(html) {
|
success: function(html) {
|
||||||
return html;
|
return html;
|
||||||
}
|
},
|
||||||
|
error: function (request, status, error) {
|
||||||
|
console.log(request.responseText);
|
||||||
|
}
|
||||||
}).responseText;
|
}).responseText;
|
||||||
|
|
||||||
html = '<x-bbcode alt=\"'+btoa(s)+'\">' + html + '</x-bbcode> ' ;
|
html = '<x-bbcode alt=\"'+btoa(s)+'\">' + html + '</x-bbcode> ' ;
|
||||||
@@ -202,12 +208,15 @@
|
|||||||
type: "POST",
|
type: "POST",
|
||||||
url: url + "/parser.php",
|
url: url + "/parser.php",
|
||||||
data: { content: s, mode: 'tobbcode' },
|
data: { content: s, mode: 'tobbcode' },
|
||||||
async : false,
|
async: false,
|
||||||
|
|
||||||
dataType: "html",
|
dataType: "html",
|
||||||
success: function(html) {
|
success: function(html) {
|
||||||
return html;
|
return html;
|
||||||
}
|
},
|
||||||
|
error: function (request, status, error) {
|
||||||
|
console.log(request.responseText);
|
||||||
|
}
|
||||||
}).responseText;
|
}).responseText;
|
||||||
|
|
||||||
return p;
|
return p;
|
||||||
@@ -227,12 +236,15 @@
|
|||||||
type: "POST",
|
type: "POST",
|
||||||
url: url + "/parser.php",
|
url: url + "/parser.php",
|
||||||
data: { content: s, mode: 'tohtml' },
|
data: { content: s, mode: 'tohtml' },
|
||||||
async : false,
|
async: false,
|
||||||
|
|
||||||
dataType: "html",
|
dataType: "html",
|
||||||
success: function(html) {
|
success: function(html) {
|
||||||
return html;
|
return html;
|
||||||
}
|
},
|
||||||
|
error: function (request, status, error) {
|
||||||
|
console.log(request.responseText);
|
||||||
|
}
|
||||||
}).responseText;
|
}).responseText;
|
||||||
|
|
||||||
return p;
|
return p;
|
||||||
|
@@ -1143,7 +1143,7 @@ class e_formTest extends \Codeception\Test\Unit
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Loads snipper from e107_themes/bootstrap/snippets/form_checkbox.html
|
* Loads snipper from e107_themes/bootstrap/snippets/form_checkbox.html
|
||||||
*/
|
*//*
|
||||||
public function testSnippet()
|
public function testSnippet()
|
||||||
{
|
{
|
||||||
$this->_frm->_snippets = true;
|
$this->_frm->_snippets = true;
|
||||||
@@ -1158,7 +1158,7 @@ class e_formTest extends \Codeception\Test\Unit
|
|||||||
|
|
||||||
$this->_frm->_snippets = false;
|
$this->_frm->_snippets = false;
|
||||||
|
|
||||||
}
|
}*/
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -82,7 +82,7 @@ class ecacheTest extends \Codeception\Test\Unit
|
|||||||
|
|
||||||
$this->cache->setMD5('hash'); // set a consistent hash value: ie. 0800fc577294c34e0b28ad2839435945
|
$this->cache->setMD5('hash'); // set a consistent hash value: ie. 0800fc577294c34e0b28ad2839435945
|
||||||
|
|
||||||
$clean = ["\t", "\n", " "];
|
$clean = ["\t", "\n", "\r", " "];
|
||||||
|
|
||||||
foreach($tests as $var)
|
foreach($tests as $var)
|
||||||
{
|
{
|
||||||
|
@@ -1,4 +0,0 @@
|
|||||||
<label class='checkbox form-check'>
|
|
||||||
<input id='{id}' class='{class}' type='checkbox' {attributes} />
|
|
||||||
<span>{label}</span>
|
|
||||||
</label>
|
|
@@ -1,4 +0,0 @@
|
|||||||
<label class="radio-inline form-check-inline">
|
|
||||||
<input class="form-check-input" type="radio" {attributes} />
|
|
||||||
<span>{label}</span>
|
|
||||||
</label>
|
|
Reference in New Issue
Block a user