Skip to content

Commit

Permalink
0.1.12
Browse files Browse the repository at this point in the history
  • Loading branch information
martec committed Jul 18, 2017
1 parent 9df1032 commit d0e3871
Show file tree
Hide file tree
Showing 24 changed files with 644 additions and 617 deletions.
1 change: 1 addition & 0 deletions rin/editor/acp/main_module.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public function main($id, $mode)
'RCE_autosave' => array('default' => 1, 'validation' => array()),
'RCE_autosave_message' => array('default' => 0, 'validation' => array()),
'RCE_height' => array('default' => 250, 'validation' => array('num', false, 0, 1000)),
'RCE_max_height' => array('default' => 500, 'validation' => array('num', false, 0, 1000)),
'RCE_quickquote' => array('default' => 1, 'validation' => array()),
'RCE_supsment' => array('default' => 0, 'validation' => array()),
'RCE_supext' => array('default' => 0, 'validation' => array()),
Expand Down
5 changes: 5 additions & 0 deletions rin/editor/adm/style/rin_editor_body.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ <h1>{{ lang('SETTINGS') }}</h1>
<span>{{ lang('RCE_HEIGHT_DESC') }}</span></dt>
<dd><input type="number" name="RCE_height" id="RCE_height" size="10" maxlength="3" value="{{ RCE_HEIGHT }}" /></dd>
</dl>
<dl>
<dt><label for="RCE_max_height">{{ lang('RCE_MAX_HEIGHT_TITLE') }}</label><br />
<span>{{ lang('RCE_MAX_HEIGHT_DESC') }}</span></dt>
<dd><input type="number" name="RCE_max_height" id="RCE_max_height" size="10" maxlength="3" value="{{ RCE_MAX_HEIGHT }}" /></dd>
</dl>
<dl>
<dt><label for="RCE_quickquote">{{ lang('RCE_QUICKQUOTE_TITLE') }}</label><br />
<span>{{ lang('RCE_QUICKQUOTE_DESC') }}</span</dt>
Expand Down
2 changes: 1 addition & 1 deletion rin/editor/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"type": "phpbb-extension",
"description": "Rin Editor for phpBB",
"homepage": "https://github.com/martec/Rin-Editor_for_phpBB",
"version": "0.1.11",
"version": "0.1.12",
"time": "2017-07-16",
"license": "GPL-2.0",
"authors": [
Expand Down
1 change: 1 addition & 0 deletions rin/editor/event/main_listener.php
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ public function initialize_rceditor($event, $eventname)
'RCE_AUTOSAVE' => $this->config['RCE_autosave'],
'RCE_AUTOSAVE_MESSAGE' => $this->config['RCE_autosave_message'],
'RCE_HEIGHT' => $this->config['RCE_height'],
'RCE_MAX_HEIGHT' => $this->config['RCE_max_height'],
'RCE_IMGURAPI' => $this->config['RCE_imgurapi'],
'RCE_SKIN' => $this->config['RCE_skin'],
'RCE_QUICK_QUOTE' => $this->config['RCE_quickquote'],
Expand Down
2 changes: 2 additions & 0 deletions rin/editor/language/en/rce.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@
'RCE_SUPSMENT_DESC' => 'Set to no if you do not want enable support for Simple mentions extension feature.<br /><strong>Ps.</strong> Before active this feature, you need to install Simple mentions extension. https://www.phpbb.com/customise/db/extension/simple_mentions/',
'RCE_HEIGHT_TITLE' => 'Height of the editor',
'RCE_HEIGHT_DESC' => 'Set the height of the editor (value in px).',
'RCE_MAX_HEIGHT_TITLE' => 'Max height of the editor',
'RCE_MAX_HEIGHT_DESC' => 'Set the max height of the editor (value in px).',
'RCE_SUPEXT_TITLE' => 'Active support for external extensions buttons',
'RCE_SUPEXT_DESC' => 'Set to yes if you want enable support for external extensions buttons.<br /><strong>Ps.</strong> This feature does not work in ACP, Quick Reply and Quick Edit.',
'RCE_DESNOPOP_TITLE' => 'No popup of description to custom buttons',
Expand Down
1 change: 1 addition & 0 deletions rin/editor/migrations/add_module.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public function update_data()
array('config.add', array('RCE_quickquote', 1)),
array('config.add', array('RCE_supsment', 0)),
array('config.add', array('RCE_height', 250)),
array('config.add', array('RCE_max_height', 500)),
array('config.add', array('RCE_supext', 1)),
array('config.add', array('RCE_desnopop', 0)),
array('config.add', array('RCE_partial', 0)),
Expand Down
1,171 changes: 588 additions & 583 deletions rin/editor/styles/all/template/js/ckeditor.js

Large diffs are not rendered by default.

11 changes: 5 additions & 6 deletions rin/editor/styles/all/template/js/quickquote.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@
.rin-qc::before {
content: ' ';
position: absolute;
bottom: -6px;
left: 50%;
margin-left: -6px;
border-top: 6px solid #444;
border-left: 6px solid transparent;
border-right: 6px solid transparent;
top: -6px;
left: 75%;
border-left: 6px solid transparent;
border-right: 6px solid transparent;
border-bottom: 6px solid #444;
}

.rin-qc span {
Expand Down
8 changes: 5 additions & 3 deletions rin/editor/styles/all/template/js/rck.init.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

26 changes: 14 additions & 12 deletions rin/editor/styles/all/template/js/thread.quickquote.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions rin/editor/styles/all/template/rineditor_config.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
smiley_sc: rinsmileysc,
autosave_saveDetectionSelectors: 'input[name*="post"],input[name*="save"],input[name*="preview"]',
autosave_message: rinautosavemsg,
autoGrow_minHeight: rinheight,
autoGrow_maxHeight: rinmaxheight,
imgurClientId: rinimgur,
disableNativeSpellChecker: false,
skin: rinskin
Expand Down
6 changes: 6 additions & 0 deletions rin/editor/styles/all/template/rineditor_full.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
rinmobsms = '{{ RCE_MOBM_SOURCE }}',
rinlanguage = '{{ RCE_LANGUAGE }}',
rinheight = '{{ RCE_HEIGHT }}',
rinmaxheight = '{{ RCE_MAX_HEIGHT }}',
rinrmvbut = '{% for RCE_RMV_BUTTONS in loops.RCE_RMV_BUTTONS %}{{ RCE_RMV_BUTTONS.rule }}{% if !RCE_RMV_BUTTONS.S_LAST_ROW %},{% endif %}{% endfor %}',
extrabut = {
{% for RCE_RULES in loops.RCE_RULES %}"{{ RCE_RULES.rule }}":"{{ RCE_RULES.help }}"{% if !RCE_RULES.S_LAST_ROW %},{% endif %}{% endfor %}
Expand All @@ -54,6 +55,11 @@
postdate = [{% for RCE_POST_ROW in loops.RCE_POST_ROW %}"{{ RCE_POST_ROW.RCE_POST_TIME }}"{% if !RCE_POST_ROW.S_LAST_ROW %}, {% endif %}{% endfor %}],
postuid = [{% for RCE_POST_ROW in loops.RCE_POST_ROW %}"{{ RCE_POST_ROW.RCE_USER_ID }}"{% if !RCE_POST_ROW.S_LAST_ROW %}, {% endif %}{% endfor %}];
</script>
<style type="text/css">
#postingbox {
max-height: none;
}
</style>
{% include 'rineditor_config.html' %}
{% INCLUDEJS '@rin_editor/js/rineditor.js' %}
{% INCLUDEJS '@rin_editor/js/ckeditor.js' %}
Expand Down
Loading

0 comments on commit d0e3871

Please sign in to comment.