diff --git a/rin/editor/acp/main_module.php b/rin/editor/acp/main_module.php
index 62e2765..dd4e4cf 100644
--- a/rin/editor/acp/main_module.php
+++ b/rin/editor/acp/main_module.php
@@ -69,6 +69,7 @@ public function main($id, $mode)
'RCE_desnopop' => array('default' => 0, 'validation' => array()),
'RCE_partial' => array('default' => 1, 'validation' => array()),
'RCE_seltxt' => array('default' => 0, 'validation' => array()),
+ 'RCE_rmv_acp_color' => array('default' => 0, 'validation' => array()),
'RCE_cache' => array('default' => 0, 'validation' => array('num', false, 0, 86400)),
'RCE_imgurapi' => array('default' => '', 'validation' => array('string', false, 0, 255)),
'RCE_skin' => array('default' => 'moonocolor', 'validation' => array('string', false, 0, 255)),
diff --git a/rin/editor/adm/style/event/acp_posting_buttons_before.html b/rin/editor/adm/style/event/acp_posting_buttons_before.html
index 7f3f79c..56e8c35 100644
--- a/rin/editor/adm/style/event/acp_posting_buttons_before.html
+++ b/rin/editor/adm/style/event/acp_posting_buttons_before.html
@@ -1,2 +1,2 @@
{% include 'rineditor_full.html' %}
-
\ No newline at end of file
+{% INCLUDEJS '@rin_editor/js/rck.acp.js' %}
\ No newline at end of file
diff --git a/rin/editor/adm/style/rin_editor_body.html b/rin/editor/adm/style/rin_editor_body.html
index 792a6b3..25d0f10 100644
--- a/rin/editor/adm/style/rin_editor_body.html
+++ b/rin/editor/adm/style/rin_editor_body.html
@@ -1,122 +1,128 @@
-
+{% INCLUDE 'overall_header.html' %}
-
{L_SETTINGS}
+{{ lang('SETTINGS') }}
-
-
-
\ No newline at end of file
+{% INCLUDEJS '@rin_editor/js/perm.js' %}
+{% INCLUDE 'overall_footer.html' %}
\ No newline at end of file
diff --git a/rin/editor/composer.json b/rin/editor/composer.json
index 5004565..cf85600 100644
--- a/rin/editor/composer.json
+++ b/rin/editor/composer.json
@@ -3,8 +3,8 @@
"type": "phpbb-extension",
"description": "Rin Editor for phpBB",
"homepage": "https://github.com/martec/Rin-Editor_for_phpBB",
- "version": "0.1.3",
- "time": "2017-07-02",
+ "version": "0.1.4",
+ "time": "2017-07-06",
"license": "GPL-2.0",
"authors": [
{
diff --git a/rin/editor/event/main_listener.php b/rin/editor/event/main_listener.php
index 9973f89..785869d 100644
--- a/rin/editor/event/main_listener.php
+++ b/rin/editor/event/main_listener.php
@@ -180,7 +180,7 @@ public function initialize_rceditor($event, $eventname)
$bbcode_disp_array = array();
$rce_default_noperm_bbcode = array();
- $sql = 'SELECT display_on_posting, bbcode_tag
+ $sql = 'SELECT display_on_posting, bbcode_tag, bbcode_helpline
FROM ' . BBCODES_TABLE . '';
if ((int)$this->config['RCE_cache']) {
@@ -196,7 +196,7 @@ public function initialize_rceditor($event, $eventname)
$rce_default_noperm_bbcode[$row['bbcode_tag']] = $row['bbcode_tag'];
}
else if (!isset($rce_default_bbcode[$row['bbcode_tag']]) && $row['display_on_posting']) {
- $bbcode_disp_array[$row['bbcode_tag']] = $row['bbcode_tag'];
+ $bbcode_disp_array[$row['bbcode_tag']] = $row['bbcode_helpline'];
}
}
else {
@@ -206,13 +206,13 @@ public function initialize_rceditor($event, $eventname)
}
}
- foreach ($bbcode_disp_array as $bbcode_disp_array_name)
+ foreach ($bbcode_disp_array as $bbcode_disp_array_name => $bbcode_disp_array_value)
{
if (substr($bbcode_disp_array_name, -1) == "=") {
- $this->template->assign_block_vars('RCE_RULES_DES', array('rule' => rtrim($bbcode_disp_array_name, '=')));
+ $this->template->assign_block_vars('RCE_RULES_DES', array('rule' => rtrim($bbcode_disp_array_name, '='), 'help' => $bbcode_disp_array_value));
}
else {
- $this->template->assign_block_vars('RCE_RULES', array('rule' => $bbcode_disp_array_name));
+ $this->template->assign_block_vars('RCE_RULES', array('rule' => $bbcode_disp_array_name, 'help' => $bbcode_disp_array_value));
}
}
@@ -255,10 +255,10 @@ public function initialize_rceditor($event, $eventname)
while ($row = $this->db->sql_fetchrow($result))
{
if (intval($row['display_on_posting'])) {
- $this->template->assign_block_vars('RCE_EMOTICONS', array('code' => ' '.$this->htmlspecialchars_uni($row['code']).' ', 'url' => $this->root_path . $this->config['smilies_path'] . '/' . $row['smiley_url'], 'name' => $row['emotion']));
+ $this->template->assign_block_vars('RCE_EMOTICONS', array('code' => $this->htmlspecialchars_uni($row['code']), 'url' => $this->root_path . $this->config['smilies_path'] . '/' . $row['smiley_url'], 'name' => $row['emotion']));
}
else {
- $this->template->assign_block_vars('RCE_EMOTICONS_PLUS', array('code' => ' '.$this->htmlspecialchars_uni($row['code']).' ', 'url' => $this->root_path . $this->config['smilies_path'] . '/' . $row['smiley_url'], 'name' => $row['emotion']));
+ $this->template->assign_block_vars('RCE_EMOTICONS_PLUS', array('code' => $this->htmlspecialchars_uni($row['code']), 'url' => $this->root_path . $this->config['smilies_path'] . '/' . $row['smiley_url'], 'name' => $row['emotion']));
}
}
@@ -285,6 +285,7 @@ public function initialize_rceditor($event, $eventname)
'RCE_DES_NOPOP' => $this->config['RCE_desnopop'],
'RCE_PARTIAL' => $this->config['RCE_partial'],
'RCE_SELTEXT' => $this->config['RCE_seltxt'],
+ 'RCE_RMV_COLOR' => $this->config['RCE_rmv_acp_color'],
'RCE_ROOT_PATH' => $this->root_path,
'RCE_SMILEY_PATH' => $this->root_path . $this->config['smilies_path'] . '/',
'RCE_MAX_NAME_CARACT' => $this->config['max_name_chars'],
@@ -295,6 +296,7 @@ public function initialize_rceditor($event, $eventname)
'RCE_URL_STATUS' => $url_status,
'RCE_FLASH_STATUS' => $flash_status,
'RCE_QUOTE_STATUS' => $quote_status,
+ 'RCE_USER_LANGUAGE' => $this->user->data['user_lang'],
));
}
diff --git a/rin/editor/language/en/rce.php b/rin/editor/language/en/rce.php
index c08b3ce..7e3b4ed 100644
--- a/rin/editor/language/en/rce.php
+++ b/rin/editor/language/en/rce.php
@@ -60,6 +60,8 @@
'RCE_PARTIAL_DESC' => 'Set to yes if you want enable Partial Mode feature.
Ps. This feature does not convert quote tag and code tag in WYSIWYG style like in Xenforo.',
'RCE_SELTXT_TITLE' => 'Do not replace selected text',
'RCE_SELTXT_DESC' => 'Set to yes if you do not want that selected text is replaced when the custom button is triggered.
Ps. Enabling this function may result in some bugs.',
+ 'RCE_RMV_ACP_COLOR_TITLE' => 'Remove ACP Color Picker',
+ 'RCE_RMV_ACP_COLOR_DESC' => 'Set to yes if you want remove acp color picker.',
'RCE_CACHE_TITLE' => 'Cache',
'RCE_CACHE_DESC' => 'Set the cache time in seconds. Set 0 to disable this function. Max value allowed is 86400.
Ps. After fully configured it is strongly recommended to use the cache to not inhibit performance.',
'RCE_IMGUR_TITLE' => 'Imgur',
diff --git a/rin/editor/migrations/add_module.php b/rin/editor/migrations/add_module.php
index 1efe7e8..61da863 100644
--- a/rin/editor/migrations/add_module.php
+++ b/rin/editor/migrations/add_module.php
@@ -43,6 +43,7 @@ public function update_data()
array('config.add', array('RCE_seltxt', 1)),
array('config.add', array('RCE_imgurapi', '')),
array('config.add', array('RCE_skin', 'moonocolor')),
+ array('config.add', array('RCE_rmv_acp_color', 0)),
array('config_text.add', array('RCE_bbcode_permission', '')),
// Add a parent module (ACP_DEMO_TITLE) to the Extensions tab (ACP_CAT_DOT_MODS)
diff --git a/rin/editor/styles/all/template/event/posting_editor_buttons_after.html b/rin/editor/styles/all/template/event/posting_editor_buttons_after.html
index b46f950..a5f8227 100644
--- a/rin/editor/styles/all/template/event/posting_editor_buttons_after.html
+++ b/rin/editor/styles/all/template/event/posting_editor_buttons_after.html
@@ -1,4 +1,4 @@
-
+{% if RCE_LOAD %}
-
\ No newline at end of file
+{% endif %}
\ No newline at end of file
diff --git a/rin/editor/styles/all/template/event/quickreply_editor_panel_after.html b/rin/editor/styles/all/template/event/quickreply_editor_panel_after.html
index d15042f..2106446 100644
--- a/rin/editor/styles/all/template/event/quickreply_editor_panel_after.html
+++ b/rin/editor/styles/all/template/event/quickreply_editor_panel_after.html
@@ -1,4 +1,4 @@
-
-
-
-
+{% if RCE_LOAD and RCE_QUICK_QUOTE %}
+{% INCLUDECSS '@rin_editor/js/quickquote.css' %}
+{% INCLUDEJS '@rin_editor/js/thread.quickquote.js' %}
+{% endif %}
diff --git a/rin/editor/styles/all/template/event/simple_footer_after.html b/rin/editor/styles/all/template/event/simple_footer_after.html
index 4f44194..fb81b86 100644
--- a/rin/editor/styles/all/template/event/simple_footer_after.html
+++ b/rin/editor/styles/all/template/event/simple_footer_after.html
@@ -1 +1 @@
-
\ No newline at end of file
+{% if RCE_LOAD %}{% INCLUDEJS '@rin_editor/js/smile.js' %}{% endif %}
\ No newline at end of file
diff --git a/rin/editor/styles/all/template/event/viewtopic_body_postrow_post_details_before.html b/rin/editor/styles/all/template/event/viewtopic_body_postrow_post_details_before.html
index e1e73cf..6685e7d 100644
--- a/rin/editor/styles/all/template/event/viewtopic_body_postrow_post_details_before.html
+++ b/rin/editor/styles/all/template/event/viewtopic_body_postrow_post_details_before.html
@@ -1,8 +1,8 @@
-
-
+{% if RCE_LOAD and RCE_QUICK_QUOTE %}
+
-
\ No newline at end of file
+{% endif %}
\ No newline at end of file
diff --git a/rin/editor/styles/all/template/js/ckeditor.js b/rin/editor/styles/all/template/js/ckeditor.js
index abae300..c788b65 100644
--- a/rin/editor/styles/all/template/js/ckeditor.js
+++ b/rin/editor/styles/all/template/js/ckeditor.js
@@ -2,14 +2,14 @@
Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.md or http://ckeditor.com/license
*/
-(function(){function ja(a,g){CKEDITOR.tools.extend(this,g,{editor:a,id:"cke-"+CKEDITOR.tools.getUniqueId(),area:a._.notificationArea});g.type||(this.type="info");this.element=this._createElement();a.plugins.clipboard&&CKEDITOR.plugins.clipboard.preventDefaultDropOnElement(this.element)}function ka(a){var g=this;this.editor=a;this.notifications=[];this.element=this._createElement();this._uiBuffer=CKEDITOR.tools.eventsBuffer(10,this._layout,this);this._changeBuffer=CKEDITOR.tools.eventsBuffer(500,this._layout,
-this);a.on("destroy",function(){g._removeListeners();g.element.remove()})}window.CKEDITOR&&window.CKEDITOR.dom||(window.CKEDITOR||(window.CKEDITOR=function(){var a=/(^|.*[\\\/])ckeditor\.js(?:\?.*|;.*)?$/i,g={timestamp:"H624",version:"4.7.0 DEV",revision:"cce5ef6",rnd:Math.floor(900*Math.random())+100,_:{pending:[],basePathSrcPattern:a},status:"unloaded",basePath:function(){var d=window.CKEDITOR_BASEPATH||"";if(!d)for(var b=document.getElementsByTagName("script"),g=0;gh.getListenerIndex(b)){h=h.listeners;g||(g=this);isNaN(f)&&(f=10);var n=this;l.fn=b;l.priority=f;for(var u=h.length-1;0<=u;u--)if(h[u].priority<=f)return h.splice(u+1,0,l),{removeListener:c};h.unshift(l)}return{removeListener:c}},once:function(){var a=Array.prototype.slice.call(arguments),
-b=a[1];a[1]=function(a){a.removeListener();return b.apply(this,arguments)};return this.on.apply(this,a)},capture:function(){CKEDITOR.event.useCapture=1;var a=this.on.apply(this,arguments);CKEDITOR.event.useCapture=0;return a},fire:function(){var a=0,b=function(){a=1},m=0,k=function(){m=1};return function(f,l,c){var h=g(this)[f];f=a;var n=m;a=m=0;if(h){var u=h.listeners;if(u.length)for(var u=u.slice(0),t,x=0;xdocument.documentMode),mobile:-1=E.getChildCount()?(E=E.getChild(B-1),F=!0):E=E.getChild(B):I=F=!0;k.type==CKEDITOR.NODE_TEXT?q?H=!0:k.split(y):0ga)for(;ca;)ca=f(ca,M,!0);M=V}q||g()}}function b(){var a=!1,b=CKEDITOR.dom.walker.whitespaces(),c=CKEDITOR.dom.walker.bookmark(!0),d=CKEDITOR.dom.walker.bogus();return function(e){return c(e)||b(e)?!0:d(e)&&!a?a=!0:e.type==CKEDITOR.NODE_TEXT&&(e.hasAscendant("pre")||CKEDITOR.tools.trim(e.getText()).length)||e.type==CKEDITOR.NODE_ELEMENT&&!e.is(m)?!1:!0}}function d(a){var b=CKEDITOR.dom.walker.whitespaces(),c=CKEDITOR.dom.walker.bookmark(1);
+D.length);for(a=0;a=E.getChildCount()?(E=E.getChild(B-1),G=!0):E=E.getChild(B):I=G=!0;k.type==CKEDITOR.NODE_TEXT?q?H=!0:k.split(x):0fa)for(;ba;)ba=f(ba,N,!0);N=V}q||g()}}function b(){var a=!1,b=CKEDITOR.dom.walker.whitespaces(),c=CKEDITOR.dom.walker.bookmark(!0),d=CKEDITOR.dom.walker.bogus();return function(e){return c(e)||b(e)?!0:d(e)&&!a?a=!0:e.type==CKEDITOR.NODE_TEXT&&(e.hasAscendant("pre")||CKEDITOR.tools.trim(e.getText()).length)||e.type==CKEDITOR.NODE_ELEMENT&&!e.is(m)?!1:!0}}function d(a){var b=CKEDITOR.dom.walker.whitespaces(),c=CKEDITOR.dom.walker.bookmark(1);
return function(d){return c(d)||b(d)?!0:!a&&k(d)||d.type==CKEDITOR.NODE_ELEMENT&&d.is(CKEDITOR.dtd.$removeEmpty)}}function e(a){return function(){var b;return this[a?"getPreviousNode":"getNextNode"](function(a){!b&&c(a)&&(b=a);return l(a)&&!(k(a)&&a.equals(b))})}}var m={abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,"var":1},k=CKEDITOR.dom.walker.bogus(),f=/^[\t\r\n ]*(?: |\xa0)$/,
l=CKEDITOR.dom.walker.editable(),c=CKEDITOR.dom.walker.ignored(!0);CKEDITOR.dom.range.prototype={clone:function(){var a=new CKEDITOR.dom.range(this.root);a._setStartContainer(this.startContainer);a.startOffset=this.startOffset;a._setEndContainer(this.endContainer);a.endOffset=this.endOffset;a.collapsed=this.collapsed;return a},collapse:function(a){a?(this._setEndContainer(this.startContainer),this.endOffset=this.startOffset):(this._setStartContainer(this.endContainer),this.startOffset=this.endOffset);
this.collapsed=!0},cloneContents:function(a){var b=new CKEDITOR.dom.documentFragment(this.document);this.collapsed||g(this,2,b,!1,"undefined"==typeof a?!0:a);return b},deleteContents:function(a){this.collapsed||g(this,0,null,a)},extractContents:function(a,b){var c=new CKEDITOR.dom.documentFragment(this.document);this.collapsed||g(this,1,c,a,"undefined"==typeof b?!0:b);return c},createBookmark:function(a){var b,c,d,e,f=this.collapsed;b=this.document.createElement("span");b.data("cke-bookmark",1);b.setStyle("display",
@@ -146,16 +146,16 @@ a.getNextSourceNode()||a}if(b.type==CKEDITOR.NODE_ELEMENT)if(e=b.getChildCount()
c:c.getCommonAncestor(d);return b&&!c.is?c.getParent():c},optimize:function(){var a=this.startContainer,b=this.startOffset;a.type!=CKEDITOR.NODE_ELEMENT&&(b?b>=a.getLength()&&this.setStartAfter(a):this.setStartBefore(a));a=this.endContainer;b=this.endOffset;a.type!=CKEDITOR.NODE_ELEMENT&&(b?b>=a.getLength()&&this.setEndAfter(a):this.setEndBefore(a))},optimizeBookmark:function(){var a=this.startContainer,b=this.endContainer;a.is&&a.is("span")&&a.data("cke-bookmark")&&this.setStartAt(a,CKEDITOR.POSITION_BEFORE_START);
b&&b.is&&b.is("span")&&b.data("cke-bookmark")&&this.setEndAt(b,CKEDITOR.POSITION_AFTER_END)},trim:function(a,b){var c=this.startContainer,d=this.startOffset,e=this.collapsed;if((!a||e)&&c&&c.type==CKEDITOR.NODE_TEXT){if(d)if(d>=c.getLength())d=c.getIndex()+1,c=c.getParent();else{var f=c.split(d),d=c.getIndex()+1,c=c.getParent();this.startContainer.equals(this.endContainer)?this.setEnd(f,this.endOffset-this.startOffset):c.equals(this.endContainer)&&(this.endOffset+=1)}else d=c.getIndex(),c=c.getParent();
this.setStart(c,d);if(e){this.collapse(!0);return}}c=this.endContainer;d=this.endOffset;b||e||!c||c.type!=CKEDITOR.NODE_TEXT||(d?(d>=c.getLength()||c.split(d),d=c.getIndex()+1):d=c.getIndex(),c=c.getParent(),this.setEnd(c,d))},enlarge:function(a,b){function c(a){return a&&a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("contenteditable")?null:a}var d=new RegExp(/[^\s\ufeff]/);switch(a){case CKEDITOR.ENLARGE_INLINE:var e=1;case CKEDITOR.ENLARGE_ELEMENT:var f=function(a,b){var h=new CKEDITOR.dom.range(k);
-h.setStart(a,b);h.setEndAt(k,CKEDITOR.POSITION_BEFORE_END);var h=new CKEDITOR.dom.walker(h),c;for(h.guard=function(a){return!(a.type==CKEDITOR.NODE_ELEMENT&&a.isBlockBoundary())};c=h.next();){if(c.type!=CKEDITOR.NODE_TEXT)return!1;C=c!=a?c.getText():c.substring(b);if(d.test(C))return!1}return!0};if(this.collapsed)break;var g=this.getCommonAncestor(),k=this.root,m,l,q,z,E,y=!1,B,C;B=this.startContainer;var F=this.startOffset;B.type==CKEDITOR.NODE_TEXT?(F&&(B=!CKEDITOR.tools.trim(B.substring(0,F)).length&&
-B,y=!!B),B&&((z=B.getPrevious())||(q=B.getParent()))):(F&&(z=B.getChild(F-1)||B.getLast()),z||(q=B));for(q=c(q);q||z;){if(q&&!z){!E&&q.equals(g)&&(E=!0);if(e?q.isBlockBoundary():!k.contains(q))break;y&&"inline"==q.getComputedStyle("display")||(y=!1,E?m=q:this.setStartBefore(q));z=q.getPrevious()}for(;z;)if(B=!1,z.type==CKEDITOR.NODE_COMMENT)z=z.getPrevious();else{if(z.type==CKEDITOR.NODE_TEXT)C=z.getText(),d.test(C)&&(z=null),B=/[\s\ufeff]$/.test(C);else if((z.$.offsetWidth>(CKEDITOR.env.webkit?1:
-0)||b&&z.is("br"))&&!z.data("cke-bookmark"))if(y&&CKEDITOR.dtd.$removeEmpty[z.getName()]){C=z.getText();if(d.test(C))z=null;else for(var F=z.$.getElementsByTagName("*"),G=0,I;I=F[G++];)if(!CKEDITOR.dtd.$removeEmpty[I.nodeName.toLowerCase()]){z=null;break}z&&(B=!!C.length)}else z=null;B&&(y?E?m=q:q&&this.setStartBefore(q):y=!0);if(z){B=z.getPrevious();if(!q&&!B){q=z;z=null;break}z=B}else q=null}q&&(q=c(q.getParent()))}B=this.endContainer;F=this.endOffset;q=z=null;E=y=!1;B.type==CKEDITOR.NODE_TEXT?
-CKEDITOR.tools.trim(B.substring(F)).length?y=!0:(y=!B.getLength(),F==B.getLength()?(z=B.getNext())||(q=B.getParent()):f(B,F)&&(q=B.getParent())):(z=B.getChild(F))||(q=B);for(;q||z;){if(q&&!z){!E&&q.equals(g)&&(E=!0);if(e?q.isBlockBoundary():!k.contains(q))break;y&&"inline"==q.getComputedStyle("display")||(y=!1,E?l=q:q&&this.setEndAfter(q));z=q.getNext()}for(;z;){B=!1;if(z.type==CKEDITOR.NODE_TEXT)C=z.getText(),f(z,0)||(z=null),B=/^[\s\ufeff]/.test(C);else if(z.type==CKEDITOR.NODE_ELEMENT){if((0(CKEDITOR.env.webkit?1:
+0)||b&&z.is("br"))&&!z.data("cke-bookmark"))if(x&&CKEDITOR.dtd.$removeEmpty[z.getName()]){C=z.getText();if(d.test(C))z=null;else for(var G=z.$.getElementsByTagName("*"),F=0,I;I=G[F++];)if(!CKEDITOR.dtd.$removeEmpty[I.nodeName.toLowerCase()]){z=null;break}z&&(B=!!C.length)}else z=null;B&&(x?E?m=q:q&&this.setStartBefore(q):x=!0);if(z){B=z.getPrevious();if(!q&&!B){q=z;z=null;break}z=B}else q=null}q&&(q=c(q.getParent()))}B=this.endContainer;G=this.endOffset;q=z=null;E=x=!1;B.type==CKEDITOR.NODE_TEXT?
+CKEDITOR.tools.trim(B.substring(G)).length?x=!0:(x=!B.getLength(),G==B.getLength()?(z=B.getNext())||(q=B.getParent()):f(B,G)&&(q=B.getParent())):(z=B.getChild(G))||(q=B);for(;q||z;){if(q&&!z){!E&&q.equals(g)&&(E=!0);if(e?q.isBlockBoundary():!k.contains(q))break;x&&"inline"==q.getComputedStyle("display")||(x=!1,E?l=q:q&&this.setEndAfter(q));z=q.getNext()}for(;z;){B=!1;if(z.type==CKEDITOR.NODE_TEXT)C=z.getText(),f(z,0)||(z=null),B=/^[\s\ufeff]/.test(C);else if(z.type==CKEDITOR.NODE_ELEMENT){if((0=g.getLength()?f.setStartAfter(g):(f.setStartBefore(g),c=0):f.setStartBefore(g));k&&k.type==CKEDITOR.NODE_TEXT&&(l?l>=k.getLength()?f.setEndAfter(k):(f.setEndAfter(k),q=0):f.setEndBefore(k));var f=new CKEDITOR.dom.walker(f),z=CKEDITOR.dom.walker.bookmark(),E=CKEDITOR.dom.walker.bogus();f.evaluator=function(b){return b.type==(a==CKEDITOR.SHRINK_ELEMENT?CKEDITOR.NODE_ELEMENT:CKEDITOR.NODE_TEXT)};
-var y;f.guard=function(b,c){if(e&&E(b)||z(b))return!0;if(a==CKEDITOR.SHRINK_ELEMENT&&b.type==CKEDITOR.NODE_TEXT||c&&b.equals(y)||!1===d&&b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary()||b.type==CKEDITOR.NODE_ELEMENT&&b.hasAttribute("contenteditable"))return!1;c||b.type!=CKEDITOR.NODE_ELEMENT||(y=b);return!0};c&&(g=f[a==CKEDITOR.SHRINK_ELEMENT?"lastForward":"next"]())&&this.setStartAt(g,b?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_START);q&&(f.reset(),(f=f[a==CKEDITOR.SHRINK_ELEMENT?
+var x;f.guard=function(b,c){if(e&&E(b)||z(b))return!0;if(a==CKEDITOR.SHRINK_ELEMENT&&b.type==CKEDITOR.NODE_TEXT||c&&b.equals(x)||!1===d&&b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary()||b.type==CKEDITOR.NODE_ELEMENT&&b.hasAttribute("contenteditable"))return!1;c||b.type!=CKEDITOR.NODE_ELEMENT||(x=b);return!0};c&&(g=f[a==CKEDITOR.SHRINK_ELEMENT?"lastForward":"next"]())&&this.setStartAt(g,b?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_START);q&&(f.reset(),(f=f[a==CKEDITOR.SHRINK_ELEMENT?
"lastBackward":"previous"]())&&this.setEndAt(f,b?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_AFTER_END));return!(!c&&!q)}},insertNode:function(a){this.optimizeBookmark();this.trim(!1,!0);var b=this.startContainer,c=b.getChild(this.startOffset);c?a.insertBefore(c):b.append(a);a.getParent()&&a.getParent().equals(this.endContainer)&&this.endOffset++;this.setStartBefore(a)},moveToPosition:function(a,b){this.setStartAt(a,b);this.collapse(!0)},moveToRange:function(a){this.setStart(a.startContainer,a.startOffset);
this.setEnd(a.endContainer,a.endOffset)},selectNodeContents:function(a){this.setStart(a,0);this.setEnd(a,a.type==CKEDITOR.NODE_TEXT?a.getLength():a.getChildCount())},setStart:function(b,c){b.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$empty[b.getName()]&&(c=b.getIndex(),b=b.getParent());this._setStartContainer(b);this.startOffset=c;this.endContainer||(this._setEndContainer(b),this.endOffset=c);a(this)},setEnd:function(b,c){b.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$empty[b.getName()]&&(c=b.getIndex()+
1,b=b.getParent());this._setEndContainer(b);this.endOffset=c;this.startContainer||(this._setStartContainer(b),this.startOffset=c);a(this)},setStartAfter:function(a){this.setStart(a.getParent(),a.getIndex()+1)},setStartBefore:function(a){this.setStart(a.getParent(),a.getIndex())},setEndAfter:function(a){this.setEnd(a.getParent(),a.getIndex()+1)},setEndBefore:function(a){this.setEnd(a.getParent(),a.getIndex())},setStartAt:function(b,c){switch(c){case CKEDITOR.POSITION_AFTER_START:this.setStart(b,0);
@@ -179,47 +179,47 @@ d.startNode.equals(c),m=c.getPosition(d.endNode)&CKEDITOR.POSITION_PRECEDING+CKE
for(h=d.next();e(h)||b.endContainer.equals(h);)h=d.next();d=!h}d?c.setEnd(b.endContainer,b.endOffset):a.push(b);return a},[])}}(),CKEDITOR.POSITION_AFTER_START=1,CKEDITOR.POSITION_BEFORE_END=2,CKEDITOR.POSITION_BEFORE_START=3,CKEDITOR.POSITION_AFTER_END=4,CKEDITOR.ENLARGE_ELEMENT=1,CKEDITOR.ENLARGE_BLOCK_CONTENTS=2,CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS=3,CKEDITOR.ENLARGE_INLINE=4,CKEDITOR.START=1,CKEDITOR.END=2,CKEDITOR.SHRINK_ELEMENT=1,CKEDITOR.SHRINK_TEXT=2,"use strict",function(){function a(a){1>
arguments.length||(this.range=a,this.forceBrBreak=0,this.enlargeBr=1,this.enforceRealBlocks=0,this._||(this._={}))}function g(a){var b=[];a.forEach(function(a){if("true"==a.getAttribute("contenteditable"))return b.push(a),!1},CKEDITOR.NODE_ELEMENT,!0);return b}function b(a,d,e,f){a:{null==f&&(f=g(e));for(var k;k=f.shift();)if(k.getDtd().p){f={element:k,remaining:f};break a}f=null}if(!f)return 0;if((k=CKEDITOR.filter.instances[f.element.data("cke-filter")])&&!k.check(d))return b(a,d,e,f.remaining);
d=new CKEDITOR.dom.range(f.element);d.selectNodeContents(f.element);d=d.createIterator();d.enlargeBr=a.enlargeBr;d.enforceRealBlocks=a.enforceRealBlocks;d.activeFilter=d.filter=k;a._.nestedEditable={element:f.element,container:e,remaining:f.remaining,iterator:d};return 1}function d(a,b,d){if(!b)return!1;a=a.clone();a.collapse(!d);return a.checkBoundaryOfElement(b,d?CKEDITOR.START:CKEDITOR.END)}var e=/^[\r\n\t ]+$/,m=CKEDITOR.dom.walker.bookmark(!1,!0),k=CKEDITOR.dom.walker.whitespaces(!0),f=function(a){return m(a)&&
-k(a)},l={dd:1,dt:1,li:1};a.prototype={getNextParagraph:function(a){var h,g,k,t,x;a=a||"p";if(this._.nestedEditable){if(h=this._.nestedEditable.iterator.getNextParagraph(a))return this.activeFilter=this._.nestedEditable.iterator.activeFilter,h;this.activeFilter=this.filter;if(b(this,a,this._.nestedEditable.container,this._.nestedEditable.remaining))return this.activeFilter=this._.nestedEditable.iterator.activeFilter,this._.nestedEditable.iterator.getNextParagraph(a);this._.nestedEditable=null}if(!this.range.root.getDtd()[a])return null;
+k(a)},l={dd:1,dt:1,li:1};a.prototype={getNextParagraph:function(a){var h,g,k,t,y;a=a||"p";if(this._.nestedEditable){if(h=this._.nestedEditable.iterator.getNextParagraph(a))return this.activeFilter=this._.nestedEditable.iterator.activeFilter,h;this.activeFilter=this.filter;if(b(this,a,this._.nestedEditable.container,this._.nestedEditable.remaining))return this.activeFilter=this._.nestedEditable.iterator.activeFilter,this._.nestedEditable.iterator.getNextParagraph(a);this._.nestedEditable=null}if(!this.range.root.getDtd()[a])return null;
if(!this._.started){var v=this.range.clone();g=v.startPath();var p=v.endPath(),r=!v.collapsed&&d(v,g.block),w=!v.collapsed&&d(v,p.block,1);v.shrink(CKEDITOR.SHRINK_ELEMENT,!0);r&&v.setStartAt(g.block,CKEDITOR.POSITION_BEFORE_END);w&&v.setEndAt(p.block,CKEDITOR.POSITION_AFTER_START);g=v.endContainer.hasAscendant("pre",!0)||v.startContainer.hasAscendant("pre",!0);v.enlarge(this.forceBrBreak&&!g||!this.enlargeBr?CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS:CKEDITOR.ENLARGE_BLOCK_CONTENTS);v.collapsed||(g=new CKEDITOR.dom.walker(v.clone()),
p=CKEDITOR.dom.walker.bookmark(!0,!0),g.evaluator=p,this._.nextNode=g.next(),g=new CKEDITOR.dom.walker(v.clone()),g.evaluator=p,g=g.previous(),this._.lastNode=g.getNextSourceNode(!0,null,v.root),this._.lastNode&&this._.lastNode.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.trim(this._.lastNode.getText())&&this._.lastNode.getParent().isBlockBoundary()&&(p=this.range.clone(),p.moveToPosition(this._.lastNode,CKEDITOR.POSITION_AFTER_END),p.checkEndOfBlock()&&(p=new CKEDITOR.dom.elementPath(p.endContainer,
p.root),this._.lastNode=(p.block||p.blockLimit).getNextSourceNode(!0))),this._.lastNode&&v.root.contains(this._.lastNode)||(this._.lastNode=this._.docEndMarker=v.document.createText(""),this._.lastNode.insertAfter(g)),v=null);this._.started=1;g=v}p=this._.nextNode;v=this._.lastNode;for(this._.nextNode=null;p;){var r=0,w=p.hasAscendant("pre"),A=p.type!=CKEDITOR.NODE_ELEMENT,q=0;if(A)p.type==CKEDITOR.NODE_TEXT&&e.test(p.getText())&&(A=0);else{var z=p.getName();if(CKEDITOR.dtd.$block[z]&&"false"==p.getAttribute("contenteditable")){h=
p;b(this,a,h);break}else if(p.isBlockBoundary(this.forceBrBreak&&!w&&{br:1})){if("br"==z)A=1;else if(!g&&!p.getChildCount()&&"hr"!=z){h=p;k=p.equals(v);break}g&&(g.setEndAt(p,CKEDITOR.POSITION_BEFORE_START),"br"!=z&&(this._.nextNode=p));r=1}else{if(p.getFirst()){g||(g=this.range.clone(),g.setStartAt(p,CKEDITOR.POSITION_BEFORE_START));p=p.getFirst();continue}A=1}}A&&!g&&(g=this.range.clone(),g.setStartAt(p,CKEDITOR.POSITION_BEFORE_START));k=(!r||A)&&p.equals(v);if(g&&!r)for(;!p.getNext(f)&&!k;){z=
p.getParent();if(z.isBlockBoundary(this.forceBrBreak&&!w&&{br:1})){r=1;A=0;k||z.equals(v);g.setEndAt(z,CKEDITOR.POSITION_BEFORE_END);break}p=z;A=1;k=p.equals(v);q=1}A&&g.setEndAt(p,CKEDITOR.POSITION_AFTER_END);p=this._getNextSourceNode(p,q,v);if((k=!p)||r&&g)break}if(!h){if(!g)return this._.docEndMarker&&this._.docEndMarker.remove(),this._.nextNode=null;h=new CKEDITOR.dom.elementPath(g.startContainer,g.root);p=h.blockLimit;r={div:1,th:1,td:1};h=h.block;!h&&p&&!this.enforceRealBlocks&&r[p.getName()]&&
-g.checkStartOfBlock()&&g.checkEndOfBlock()&&!p.equals(g.root)?h=p:!h||this.enforceRealBlocks&&h.is(l)?(h=this.range.document.createElement(a),g.extractContents().appendTo(h),h.trim(),g.insertNode(h),t=x=!0):"li"!=h.getName()?g.checkStartOfBlock()&&g.checkEndOfBlock()||(h=h.clone(!1),g.extractContents().appendTo(h),h.trim(),x=g.splitBlock(),t=!x.wasStartOfBlock,x=!x.wasEndOfBlock,g.insertNode(h)):k||(this._.nextNode=h.equals(v)?null:this._getNextSourceNode(g.getBoundaryNodes().endNode,1,v))}t&&(t=
-h.getPrevious())&&t.type==CKEDITOR.NODE_ELEMENT&&("br"==t.getName()?t.remove():t.getLast()&&"br"==t.getLast().$.nodeName.toLowerCase()&&t.getLast().remove());x&&(t=h.getLast())&&t.type==CKEDITOR.NODE_ELEMENT&&"br"==t.getName()&&(!CKEDITOR.env.needsBrFiller||t.getPrevious(m)||t.getNext(m))&&t.remove();this._.nextNode||(this._.nextNode=k||h.equals(v)||!v?null:this._getNextSourceNode(h,1,v));return h},_getNextSourceNode:function(a,b,d){function e(a){return!(a.equals(d)||a.equals(f))}var f=this.range.root;
+g.checkStartOfBlock()&&g.checkEndOfBlock()&&!p.equals(g.root)?h=p:!h||this.enforceRealBlocks&&h.is(l)?(h=this.range.document.createElement(a),g.extractContents().appendTo(h),h.trim(),g.insertNode(h),t=y=!0):"li"!=h.getName()?g.checkStartOfBlock()&&g.checkEndOfBlock()||(h=h.clone(!1),g.extractContents().appendTo(h),h.trim(),y=g.splitBlock(),t=!y.wasStartOfBlock,y=!y.wasEndOfBlock,g.insertNode(h)):k||(this._.nextNode=h.equals(v)?null:this._getNextSourceNode(g.getBoundaryNodes().endNode,1,v))}t&&(t=
+h.getPrevious())&&t.type==CKEDITOR.NODE_ELEMENT&&("br"==t.getName()?t.remove():t.getLast()&&"br"==t.getLast().$.nodeName.toLowerCase()&&t.getLast().remove());y&&(t=h.getLast())&&t.type==CKEDITOR.NODE_ELEMENT&&"br"==t.getName()&&(!CKEDITOR.env.needsBrFiller||t.getPrevious(m)||t.getNext(m))&&t.remove();this._.nextNode||(this._.nextNode=k||h.equals(v)||!v?null:this._getNextSourceNode(h,1,v));return h},_getNextSourceNode:function(a,b,d){function e(a){return!(a.equals(d)||a.equals(f))}var f=this.range.root;
for(a=a.getNextSourceNode(b,null,e);!m(a);)a=a.getNextSourceNode(b,null,e);return a}};CKEDITOR.dom.range.prototype.createIterator=function(){return new a(this)}}(),CKEDITOR.command=function(a,g){this.uiItems=[];this.exec=function(b){if(this.state==CKEDITOR.TRISTATE_DISABLED||!this.checkAllowed())return!1;this.editorFocus&&a.focus();return!1===this.fire("exec")?!0:!1!==g.exec.call(this,a,b)};this.exec2=function(b){if(this.state==CKEDITOR.TRISTATE_DISABLED||!this.checkAllowed())return!1;this.editorFocus&&
a.focus();return!1===this.fire("exec2")?!0:!1!==g.exec2.call(this,a,b)};this.refresh=function(a,b){if(!this.readOnly&&a.readOnly)return!0;if(this.context&&!b.isContextFor(this.context)||!this.checkAllowed(!0))return this.disable(),!0;this.startDisabled||this.enable();this.modes&&!this.modes[a.mode]&&this.disable();return!1===this.fire("refresh",{editor:a,path:b})?!0:g.refresh&&!1!==g.refresh.apply(this,arguments)};var b;this.checkAllowed=function(d){return d||"boolean"!=typeof b?b=a.activeFilter.checkFeature(this):
b};CKEDITOR.tools.extend(this,g,{modes:{wysiwyg:1},editorFocus:1,contextSensitive:!!g.context,state:CKEDITOR.TRISTATE_DISABLED});CKEDITOR.event.call(this)},CKEDITOR.command.prototype={enable:function(){this.state==CKEDITOR.TRISTATE_DISABLED&&this.checkAllowed()&&this.setState(this.preserveState&&"undefined"!=typeof this.previousState?this.previousState:CKEDITOR.TRISTATE_OFF)},disable:function(){this.setState(CKEDITOR.TRISTATE_DISABLED)},setState:function(a){if(this.state==a||a!=CKEDITOR.TRISTATE_DISABLED&&
!this.checkAllowed())return!1;this.previousState=this.state;this.state=a;this.fire("state");return!0},toggleState:function(){this.state==CKEDITOR.TRISTATE_OFF?this.setState(CKEDITOR.TRISTATE_ON):this.state==CKEDITOR.TRISTATE_ON&&this.setState(CKEDITOR.TRISTATE_OFF)}},CKEDITOR.event.implementOn(CKEDITOR.command.prototype),CKEDITOR.ENTER_P=1,CKEDITOR.ENTER_BR=2,CKEDITOR.ENTER_DIV=3,CKEDITOR.config={customConfig:"config.js",autoUpdateElement:!0,language:"",defaultLanguage:"en",contentsLangDirection:"",
-enterMode:CKEDITOR.ENTER_P,forceEnterMode:!1,shiftEnterMode:CKEDITOR.ENTER_BR,docType:"\x3c!DOCTYPE html\x3e",bodyId:"",bodyClass:"",fullPage:!1,height:200,contentsCss:CKEDITOR.getUrl("contents.css"),extraPlugins:"",removePlugins:"",protectedSource:[],tabIndex:0,width:"",baseFloatZIndex:1E4,blockedKeystrokes:[CKEDITOR.CTRL+66,CKEDITOR.CTRL+73,CKEDITOR.CTRL+85]},function(){function a(a,b,c,d,h){var e,f;a=[];for(e in b){f=b[e];f="boolean"==typeof f?{}:"function"==typeof f?{match:f}:G(f);"$"!=e.charAt(0)&&
-(f.elements=e);c&&(f.featureName=c.toLowerCase());var g=f;g.elements=k(g.elements,/\s+/)||null;g.propertiesOnly=g.propertiesOnly||!0===g.elements;var q=/\s*,\s*/,p=void 0;for(p in L){g[p]=k(g[p],q)||null;var m=g,l=J[p],z=k(g[J[p]],q),D=g[p],n=[],C=!0,w=void 0;z?C=!1:z={};for(w in D)"!"==w.charAt(0)&&(w=w.slice(1),n.push(w),z[w]=!0,C=!1);for(;w=n.pop();)D[w]=D["!"+w],delete D["!"+w];m[l]=(C?!1:z)||null}g.match=g.match||null;d.push(f);a.push(f)}b=h.elements;h=h.generic;var E;c=0;for(d=a.length;c=--f&&(m&&CKEDITOR.document.getDocumentElement().removeStyle("cursor"),h(b))},u=function(b,c){a[b]=1;var d=g[b];
delete g[b];for(var h=0;h=CKEDITOR.env.version||CKEDITOR.env.ie9Compat)?h.$.onreadystatechange=function(){if("loaded"==h.$.readyState||"complete"==h.$.readyState)h.$.onreadystatechange=null,u(b,!0)}:(h.$.onload=function(){setTimeout(function(){u(b,!0)},0)},h.$.onerror=function(){u(b,
-!1)}));h.appendTo(CKEDITOR.document.getHead())}}};m&&CKEDITOR.document.getDocumentElement().setStyle("cursor","wait");for(var x=0;x/g,"\x26gt;")+"\x3c/textarea\x3e");return"\x3ccke:encoded\x3e"+encodeURIComponent(a)+"\x3c/cke:encoded\x3e"})}function n(a){return a.replace(L,function(a,b){return decodeURIComponent(b)})}function u(a){return a.replace(/\x3c!--(?!{cke_protected})[\s\S]+?--\x3e/g,
-function(a){return"\x3c!--"+r+"{C}"+encodeURIComponent(a).replace(/--/g,"%2D%2D")+"--\x3e"})}function t(a){return a.replace(/\x3c!--\{cke_protected\}\{C\}([\s\S]+?)--\x3e/g,function(a,b){return decodeURIComponent(b)})}function x(a,b){var c=b._.dataStore;return a.replace(/\x3c!--\{cke_protected\}([\s\S]+?)--\x3e/g,function(a,b){return decodeURIComponent(b)}).replace(/\{cke_protected_(\d+)\}/g,function(a,b){return c&&c[b]||""})}function v(a,b){var c=[],d=b.config.protectedSource,h=b._.dataStore||(b._.dataStore=
+q||a.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT)}function k(a,b){var c=a.children[a.children.length-1];a.children.push(b);b.parent=a;c&&(c.next=b,b.previous=c)}function f(a){a=a.attributes;"false"!=a.contenteditable&&(a["data-cke-editable"]=a.contenteditable?"true":1);a.contenteditable="false"}function l(a){a=a.attributes;switch(a["data-cke-editable"]){case "true":a.contenteditable="true";break;case "1":delete a.contenteditable}}function c(a){return a.replace(C,function(a,b,c){return"\x3c"+b+c.replace(G,
+function(a,b){return F.test(b)&&-1==c.indexOf("data-cke-saved-"+b)?" data-cke-saved-"+a+" data-cke-"+CKEDITOR.rnd+"-"+a:a})+"\x3e"})}function h(a,b){return a.replace(b,function(a,b,c){0===a.indexOf("\x3ctextarea")&&(a=b+t(c).replace(//g,"\x26gt;")+"\x3c/textarea\x3e");return"\x3ccke:encoded\x3e"+encodeURIComponent(a)+"\x3c/cke:encoded\x3e"})}function n(a){return a.replace(L,function(a,b){return decodeURIComponent(b)})}function u(a){return a.replace(/\x3c!--(?!{cke_protected})[\s\S]+?--\x3e/g,
+function(a){return"\x3c!--"+r+"{C}"+encodeURIComponent(a).replace(/--/g,"%2D%2D")+"--\x3e"})}function t(a){return a.replace(/\x3c!--\{cke_protected\}\{C\}([\s\S]+?)--\x3e/g,function(a,b){return decodeURIComponent(b)})}function y(a,b){var c=b._.dataStore;return a.replace(/\x3c!--\{cke_protected\}([\s\S]+?)--\x3e/g,function(a,b){return decodeURIComponent(b)}).replace(/\{cke_protected_(\d+)\}/g,function(a,b){return c&&c[b]||""})}function v(a,b){var c=[],d=b.config.protectedSource,h=b._.dataStore||(b._.dataStore=
{id:1}),e=/<\!--\{cke_temp(comment)?\}(\d*?)--\x3e/g,d=[/
{% include 'rineditor_config.html' %}
-
-
-
-
-
-
\ No newline at end of file
+{% INCLUDEJS '@rin_editor/js/rineditor.js' %}
+{% INCLUDEJS '@rin_editor/js/ckeditor.js' %}
+{% INCLUDEJS '@rin_editor/js/adapters/jquery.js' %}
+{% INCLUDEJS '@rin_editor/js/rck.init.js' %}
+{% if RCE_SUP_SMENT and UA_AJAX_MENTION_URL %}{% INCLUDEJS '@rin_editor/js/automention.js' %}{% endif %}
+{% endif %}
\ No newline at end of file
diff --git a/rin/editor/styles/all/template/rineditor_quick.html b/rin/editor/styles/all/template/rineditor_quick.html
index 435a628..df454ea 100644
--- a/rin/editor/styles/all/template/rineditor_quick.html
+++ b/rin/editor/styles/all/template/rineditor_quick.html
@@ -1,4 +1,4 @@
-
+{% if RCE_LOAD and RCE_BBCODE_STATUS %}
{% include 'rineditor_config.html' %}
-
-
-
-
-
-
\ No newline at end of file
+{% INCLUDEJS '@rin_editor/js/rineditor.js' %}
+{% INCLUDEJS '@rin_editor/js/ckeditor.js' %}
+{% INCLUDEJS '@rin_editor/js/adapters/jquery.js' %}
+{% INCLUDEJS '@rin_editor/js/rck.init.js' %}
+{% if RCE_SUP_SMENT and UA_AJAX_MENTION_URL %}{% INCLUDEJS '@rin_editor/js/automention.js' %}{% endif %}
+{% endif %}
\ No newline at end of file