Comments AutoCompletion

apps/comments/.bowerrc

@@ -0,0 +1,3 @@
+{
+	"directory": "js/vendor"
+}

apps/comments/appinfo/app.php

@@ -27,6 +27,7 @@
 	function() {
 		\OCP\Util::addScript('oc-backbone-webdav');
 		\OCP\Util::addScript('comments', 'merged');
+		\OCP\Util::addStyle('comments', 'autocomplete');
 		\OCP\Util::addStyle('comments', 'comments');
 	}
 );

apps/comments/appinfo/info.xml

@@ -28,4 +28,10 @@
 			<provider>OCA\Comments\Activity\Provider</provider>
 		</providers>
 	</activity>
+
+	<collaboration>
+		<plugins>
+			<plugin type="autocomplete-sort">OCA\Comments\Collaboration\CommentersSorter</plugin>
+		</plugins>
+	</collaboration>
 </info>

apps/comments/composer/composer/autoload_classmap.php

@@ -11,8 +11,10 @@
     'OCA\\Comments\\Activity\\Provider' => $baseDir . '/../lib/Activity/Provider.php',
     'OCA\\Comments\\Activity\\Setting' => $baseDir . '/../lib/Activity/Setting.php',
     'OCA\\Comments\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
+    'OCA\\Comments\\Collaboration\\CommentersSorter' => $baseDir . '/../lib/Collaboration/CommentersSorter.php',
     'OCA\\Comments\\Controller\\Notifications' => $baseDir . '/../lib/Controller/Notifications.php',
     'OCA\\Comments\\EventHandler' => $baseDir . '/../lib/EventHandler.php',
+    'OCA\\Comments\\JSSettingsHelper' => $baseDir . '/../lib/JSSettingsHelper.php',
     'OCA\\Comments\\Notification\\Listener' => $baseDir . '/../lib/Notification/Listener.php',
     'OCA\\Comments\\Notification\\Notifier' => $baseDir . '/../lib/Notification/Notifier.php',
 );

apps/comments/composer/composer/autoload_static.php

@@ -26,8 +26,10 @@ class ComposerStaticInitComments
         'OCA\\Comments\\Activity\\Provider' => __DIR__ . '/..' . '/../lib/Activity/Provider.php',
         'OCA\\Comments\\Activity\\Setting' => __DIR__ . '/..' . '/../lib/Activity/Setting.php',
         'OCA\\Comments\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
+        'OCA\\Comments\\Collaboration\\CommentersSorter' => __DIR__ . '/..' . '/../lib/Collaboration/CommentersSorter.php',
         'OCA\\Comments\\Controller\\Notifications' => __DIR__ . '/..' . '/../lib/Controller/Notifications.php',
         'OCA\\Comments\\EventHandler' => __DIR__ . '/..' . '/../lib/EventHandler.php',
+        'OCA\\Comments\\JSSettingsHelper' => __DIR__ . '/..' . '/../lib/JSSettingsHelper.php',
         'OCA\\Comments\\Notification\\Listener' => __DIR__ . '/..' . '/../lib/Notification/Listener.php',
         'OCA\\Comments\\Notification\\Notifier' => __DIR__ . '/..' . '/../lib/Notification/Notifier.php',
     );

apps/comments/css/autocomplete.scss

@@ -0,0 +1,77 @@
+/**
+ * based upon apps/comments/js/vendor/At.js/dist/css/jquery.atwho.css,
+ * only changed colors and font-weight
+ */
+
+.atwho-view {
+	position:absolute;
+	top: 0;
+	left: 0;
+	display: none;
+	margin-top: 18px;
+	background: $color-main-background;
+	color: $color-main-text;
+	border: 1px solid $color-border;
+	border-radius: 3px;
+	box-shadow: 0 0 5px $color-box-shadow;
+	min-width: 120px;
+	z-index: 11110 !important;
+}
+
+.atwho-view .atwho-header {
+	padding: 5px;
+	margin: 5px;
+	cursor: pointer;
+	border-bottom: solid 1px $color-border;
+	color: $color-main-text;
+	font-size: 11px;
+	font-weight: bold;
+}
+
+.atwho-view .atwho-header .small {
+	color: $color-main-text;
+	float: right;
+	padding-top: 2px;
+	margin-right: -5px;
+	font-size: 12px;
+	font-weight: normal;
+}
+
+.atwho-view .atwho-header:hover {
+	cursor: default;
+}
+
+.atwho-view .cur {
+	background: $color-primary;
+	color: $color-primary-text;
+}
+.atwho-view .cur small {
+	color: $color-primary-text;
+}
+.atwho-view strong {
+	color: $color-main-text;
+	font-weight: normal;
+}
+.atwho-view .cur strong {
+	color: $color-primary-text;
+	font-weight: normal;
+}
+.atwho-view ul {
+	/* width: 100px; */
+	list-style:none;
+	padding:0;
+	margin:auto;
+	max-height: 200px;
+	overflow-y: auto;
+}
+.atwho-view ul li {
+	display: block;
+	padding: 5px 10px;
+	border-bottom: 1px solid $color-border;
+	cursor: pointer;
+}
+.atwho-view small {
+	font-size: smaller;
+	color: $color-main-text;
+	font-weight: normal;
+}

apps/comments/css/comments.css

@@ -48,22 +48,30 @@
 	margin-right: 6px;
 }
 
-#commentsTabView .newCommentForm textarea {
+#commentsTabView .newCommentForm div.message {
 	resize: none;
 }
 
+#commentsTabView .newCommentForm div.message:empty:before {
+	content: attr(data-placeholder);
+	color: grey;
+}
+
 #commentsTabView .comment {
 	position: relative;
 	margin-bottom: 30px;
 }
 
-#commentsTabView .comment .avatar {
+#commentsTabView .comment .avatar,
+.atwho-view-ul * .avatar{
 	width: 32px;
 	height: 32px;
 	line-height: 32px;
 }
 
-#commentsTabView .comment .message .avatar {
+#commentsTabView .comment .message .avatar,
+.atwho-view-ul * .avatar
+{
 	display: inline-block;
 }
 
@@ -112,11 +120,16 @@
 }
 
 #commentsTabView .comments li .message .avatar-name-wrapper,
+.atwho-view-ul * .avatar-name-wrapper,
 #commentsTabView .comment .authorRow {
 	position: relative;
 	cursor: pointer;
 }
 
+.atwho-view-ul * .avatar-name-wrapper {
+	white-space: nowrap;
+}
+
 #commentsTabView .comment .author,
 #commentsTabView .comment .date {
 	opacity: .5;