0.1.5

martec · Jul 7, 2017 · 50d7fe9 · 50d7fe9
1 parent debb149
commit 50d7fe9
Show file tree

Hide file tree

Showing 16 changed files with 60 additions and 14 deletions.
diff --git 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.4",
-  "time": "2017-07-06",
+  "version": "0.1.5",
+  "time": "2017-07-07",
   "license": "GPL-2.0",
   "authors": [
 	{

diff --git a/rin/editor/styles/all/template/event/overall_footer_body_after.html b/rin/editor/styles/all/template/event/overall_footer_body_after.html
@@ -0,0 +1 @@
+{% if S_PLUPLOAD %}{% include 'rineditor_plupload.html' %}{% endif %}
diff --git a/rin/editor/styles/all/template/js/ckeditor.js b/rin/editor/styles/all/template/js/ckeditor.js
diff --git a/rin/editor/styles/all/template/js/config.js b/rin/editor/styles/all/template/js/config.js
diff --git a/rin/editor/styles/all/template/js/skins/moono-lisa/editor.css b/rin/editor/styles/all/template/js/skins/moono-lisa/editor.css
diff --git a/rin/editor/styles/all/template/js/skins/moono-lisa/editor_gecko.css b/rin/editor/styles/all/template/js/skins/moono-lisa/editor_gecko.css
diff --git a/rin/editor/styles/all/template/js/skins/moono-lisa/editor_ie.css b/rin/editor/styles/all/template/js/skins/moono-lisa/editor_ie.css
diff --git a/rin/editor/styles/all/template/js/skins/moono-lisa/editor_ie8.css b/rin/editor/styles/all/template/js/skins/moono-lisa/editor_ie8.css
diff --git a/rin/editor/styles/all/template/js/skins/moono-lisa/editor_iequirks.css b/rin/editor/styles/all/template/js/skins/moono-lisa/editor_iequirks.css
diff --git a/rin/editor/styles/all/template/js/skins/moonocolor/editor.css b/rin/editor/styles/all/template/js/skins/moonocolor/editor.css
diff --git a/rin/editor/styles/all/template/js/skins/moonocolor/editor_gecko.css b/rin/editor/styles/all/template/js/skins/moonocolor/editor_gecko.css
diff --git a/rin/editor/styles/all/template/js/skins/moonocolor/editor_ie.css b/rin/editor/styles/all/template/js/skins/moonocolor/editor_ie.css
diff --git a/rin/editor/styles/all/template/js/skins/moonocolor/editor_ie7.css b/rin/editor/styles/all/template/js/skins/moonocolor/editor_ie7.css
diff --git a/rin/editor/styles/all/template/js/skins/moonocolor/editor_ie8.css b/rin/editor/styles/all/template/js/skins/moonocolor/editor_ie8.css
diff --git a/rin/editor/styles/all/template/js/skins/moonocolor/editor_iequirks.css b/rin/editor/styles/all/template/js/skins/moonocolor/editor_iequirks.css
diff --git a/rin/editor/styles/all/template/rineditor_plupload.html b/rin/editor/styles/all/template/rineditor_plupload.html
@@ -0,0 +1,38 @@
+<script type="text/javascript">
+phpbb.plupload.updateBbcode = function(action, index) {
+	var	text = CKEDITOR.instances[Object.keys(CKEDITOR.instances)[0]].getData(),
+		removal = (action === 'removal');
+
+	// Return if the bbcode isn't used at all.
+	if (text.indexOf('[attachment=') === -1) {
+		return;
+	}
+
+	function runUpdate(i) {
+		var regex = new RegExp('\\[attachment=' + i + '\\](.*?)\\[\\/attachment\\]', 'g');
+		text = text.replace(regex, function updateBbcode(_, fileName) {
+			// Remove the bbcode if the file was removed.
+			if (removal && index === i) {
+				return '';
+			}
+			var newIndex = i + ((removal) ? -1 : 1);
+			return '[attachment=' + newIndex + ']' + fileName + '[/attachment]';
+		});
+	}
+
+	// Loop forwards when removing and backwards when adding ensures we don't
+	// corrupt the bbcode index.
+	var i;
+	if (removal) {
+		for (i = index; i < phpbb.plupload.ids.length; i++) {
+			runUpdate(i);
+		}
+	} else {
+		for (i = phpbb.plupload.ids.length - 1; i >= index; i--) {
+			runUpdate(i);
+		}
+	}
+
+	CKEDITOR.instances[Object.keys(CKEDITOR.instances)[0]].setData(text);
+};
+</script>