Merge pull request ninenine#37 from NodeBB-Community/master

fix: update for 2.x fix acp page

Author: ninenine

index.js

@@ -141,15 +141,15 @@ var Beep = {
 	parseTopic: function (data, callback) {
 		// from http://htmlarrows.com/symbols/
 		var starHTML = '*';
-		
+
     if (data.topic.hasOwnProperty('title')) {
       data.topic.title = Beep.parseContent(data.topic.title, starHTML);
     }
-		
+
     if (data.topic.hasOwnProperty('slug')) {
       data.topic.slug = Beep.parseContent(data.topic.slug, starHTML);
     }
-		
+
     if (data.topic.hasOwnProperty('titleRaw')) {
       data.topic.titleRaw = Beep.parseContent(data.topic.titleRaw, starHTML);
     }

package.json

@@ -32,6 +32,6 @@
   "_id": "nodebb-plugin-beep@0.4.4",
   "_from": "nodebb-plugin-beep@0.4.4",
   "nbbpm": {
-    "compatibility": "^0.6.0 || ^0.7.0 || ^0.8.0 || ^0.9.0 || ^1.0.0 || ^1.1.0 || ^1.13.0 || ^1.16.1 "
+    "compatibility": "^1.0.0 || ^1.1.0 || ^1.13.0 || ^1.16.1 || ^2.0.0"
   }
 }

plugin.json

@@ -5,6 +5,9 @@
 	"url": "https://github.com/ninenine/nodebb-plugin-beep",
 	"library": "./index.js",
 	"templates":"public/templates",
+	"modules": {
+		"../admin/plugins/beep.js": "public/admin.js"
+	},
 	"hooks": [
 		{ "hook": "static:app.load", "method": "init" },
 		{ "hook": "action:settings.set", "method": "onListChange" },

public/admin.js

@@ -0,0 +1,20 @@
+'use strict';
+
+define('admin/plugins/beep', ['settings'], function (Settings) {
+	const admin = {};
+	admin.init = function () {
+		Settings.load('beep', $('.beep-settings'));
+
+		$('#save').on('click', function() {
+			Settings.save('beep', $('.beep-settings'), function() {
+				app.alert({
+					type: 'success',
+					alert_id: 'beep-saved',
+					title: 'Success',
+					message: 'Curse word settings have been successfully saved'
+				});
+			});
+		});
+	};
+	return admin;
+});

public/templates/admin/plugins/beep.tpl

@@ -1,4 +1,4 @@
-<div class="beep settings" class="row">
+<div class="beep" class="row">
 	<div class="col-xs-12">
 		<form role="form" class="beep-settings">
 			<div class="row">
@@ -33,7 +33,7 @@
 							<label for="urls"><i>comma-separated</i> list of Banned URLs (link will be shown as [link removed])</label>
 							<textarea class="form-control" id="urls" name="urls" placeholder="eg. google.com, yahoo.com"></textarea>
 						</div>
-					
+
 					</fieldset>
 				</div>
 			</div>
@@ -60,19 +60,3 @@
 	<i class="material-icons">save</i>
 </button>
 
-<script type="text/javascript">
-	require(['settings'], function(Settings) {
-		Settings.load('beep', $('.beep-settings'));
-
-		$('#save').on('click', function() {
-			Settings.save('beep', $('.beep-settings'), function() {
-				app.alert({
-					type: 'success',
-					alert_id: 'beep-saved',
-					title: 'Success',
-					message: 'Curse word settings have been successfully saved'
-				});
-			});
-		});
-	});
-</script>