nodebb-theme-persona 13.0.13 → 13.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "13.0.13",
+  "version": "13.0.15",
   "nbbpm": {
     "compatibility": "^3.0.0"
   },

package/public/modules/quickreply.js

@@ -1,8 +1,12 @@
 'use strict';
 
 define('persona/quickreply', [
-	'components', 'composer/autocomplete', 'api', 'alerts', 'uploadHelpers',
-], function (components, autocomplete, api, alerts, uploadHelpers) {
+	'components', 'composer', 'composer/autocomplete', 'api',
+	'alerts', 'uploadHelpers', 'mousetrap',
+], function (
+	components, composer, autocomplete, api,
+	alerts, uploadHelpers, mousetrap
+) {
 	var QuickReply = {};
 
 	QuickReply.init = function () {
@@ -27,6 +31,11 @@ define('persona/quickreply', [
 		// data.element.textcomplete(data.strategies, data.options);
 		// $('.textcomplete-wrapper').css('height', '100%').find('textarea').css('height', '100%');
 
+		mousetrap.bind('ctrl+return', (e) => {
+			if (e.target === element.get(0)) {
+				components.get('topic/quickreply/button').get(0).click();
+			}
+		});
 
 		uploadHelpers.init({
 			dragDropAreaEl: $('[component="topic/quickreply/container"] .quickreply-message'),
@@ -79,6 +88,14 @@ define('persona/quickreply', [
 				autocomplete._active.persona_qr.hide();
 			});
 		});
+
+		components.get('topic/quickreply/expand').on('click', (e) => {
+			e.preventDefault();
+
+			const textEl = components.get('topic/quickreply/text');
+			composer.newReply(ajaxify.data.tid, undefined, ajaxify.data.title, utils.escapeHTML(textEl.val()));
+			textEl.val('');
+		});
 	};
 
 	return QuickReply;

package/scss/topic.scss

@@ -381,10 +381,6 @@
 				}
 			}
 		}
-
-		[component="topic/quickreply/button"] {
-			margin-bottom: 10px;
-		}
 	}
 }
 

package/templates/flags/list.tpl

@@ -19,8 +19,8 @@
 				<i class="fa fa-clone"></i> [[flags:bulk-actions]] <span class="caret"></span>
 			</button>
 			<ul class="dropdown-menu">
-				<li><a href="#" data-action="bulk-assign">[[flags:assign-to-me]]</a></li>
-				<li><a href="#" data-action="bulk-mark-resolved">[[flags:bulk-resolve]]</a></li>
+				<li><a href="#" class="dropdown-item" data-action="bulk-assign">[[flags:assign-to-me]]</a></li>
+				<li><a href="#" class="dropdown-item" data-action="bulk-mark-resolved">[[flags:bulk-resolve]]</a></li>
 			</ul>
 		</div>
 

package/templates/partials/acceptTos.tpl

@@ -1,9 +1,9 @@
-<div class="form-group">
-	<label for="agree-terms">[[register:terms_of_use]]</label>
-	<div class="tos">{termsOfUse}</div>
-	<div class="checkbox">
-		<label>
-			<input type="checkbox" name="agree-terms" id="agree-terms"> [[register:agree_to_terms_of_use]]
-		</label>
-	</div>
+<div class="form-group">
+	<label for="agree-terms">[[register:terms_of_use]]</label>
+	<div class="tos">{termsOfUse}</div>
+	<div class="checkbox">
+		<label>
+			<input type="checkbox" name="agree-terms" id="agree-terms"> [[register:agree_to_terms_of_use]]
+		</label>
+	</div>
 </div>

package/templates/partials/categories/link.tpl

@@ -1,11 +1,11 @@
-<!-- IF ../isSection -->
-{../name}
-<!-- ELSE -->
-<!-- IF ../link -->
-<a href="{../link}" itemprop="url">
-<!-- ELSE -->
-<a href="{config.relative_path}/category/{../slug}" itemprop="url">
-<!-- ENDIF ../link -->
-{../name}
-</a>
+<!-- IF ../isSection -->
+{../name}
+<!-- ELSE -->
+<!-- IF ../link -->
+<a href="{../link}" itemprop="url">
+<!-- ELSE -->
+<a href="{config.relative_path}/category/{../slug}" itemprop="url">
+<!-- ENDIF ../link -->
+{../name}
+</a>
 <!-- ENDIF ../isSection -->

package/templates/partials/topic/quickreply.tpl

@@ -12,10 +12,13 @@
 		<input type="hidden" name="tid" value="{tid}" />
 		<input type="hidden" name="_csrf" value="{config.csrf_token}" />
 		<div class="quickreply-message">
-			<textarea name="content" component="topic/quickreply/text" class="form-control" rows="5" placeholder="[[modules:composer.textarea.placeholder]]"></textarea>
+			<textarea name="content" component="topic/quickreply/text" class="form-control mousetrap" rows="5" placeholder="[[modules:composer.textarea.placeholder]]"></textarea>
 			<div class="imagedrop"><div>[[topic:composer.drag_and_drop_images]]</div></div>
 		</div>
-		<button type="submit" component="topic/quickreply/button" class="btn btn-primary float-end">[[topic:post-quick-reply]]</button>
+		<div class="btn-group float-end">
+			<button type="submit" component="topic/quickreply/button" class="btn btn-primary">[[topic:post-quick-reply]]</button>
+			<button type="submit" component="topic/quickreply/expand" class="btn btn-outline-primary" formmethod="get"><i class="fa fa-expand"></i></button>
+		</div>
 	</form>
 	<form component="topic/quickreply/upload" method="post" enctype="multipart/form-data">
 		<input type="file" name="files[]" multiple class="hidden"/>

package/templates/tos.tpl

@@ -1,4 +1,4 @@
-<h3>[[register:terms_of_use]]</h3>
-<hr/>
-
-{termsOfUse}
+<h3>[[register:terms_of_use]]</h3>
+<hr/>
+
+{termsOfUse}

package/theme.json

@@ -1,7 +1,7 @@
-{
-    "id": "nodebb-theme-persona",
-    "name": "Persona",
-    "description": "The default theme for NodeBB. Uses a standard approach to forum design.",
-    "url": "https://github.com/psychobunny/nodebb-theme-persona",
-    "screenshot": "screenshot.png"
+{
+    "id": "nodebb-theme-persona",
+    "name": "Persona",
+    "description": "The default theme for NodeBB. Uses a standard approach to forum design.",
+    "url": "https://github.com/psychobunny/nodebb-theme-persona",
+    "screenshot": "screenshot.png"
 }