diff --git a/bower.json b/bower.json index ad5b039f..b6b69c15 100644 --- a/bower.json +++ b/bower.json @@ -15,7 +15,7 @@ "bootstrap": "~3.3.6", "ng-file-upload": "~12.1.0", "owasp-password-strength-test": "~1.3.0", - "angular-translate": "^2.15.1", + "angular-translate": "^2.16.0", "bootstrap-filestyle": "^1.2.1", "Ionicons": "ionicons#^2.0.1", "angular-moment": "^1.0.1", @@ -35,7 +35,9 @@ "bootstrap-markdown": "^2.10.0", "font-awesome": "^4.7.0", "ngprogress": "^1.1.3", - "jquery-awesome-cursor": "^0.3.1" + "jquery-awesome-cursor": "^0.3.1", + "jquery-textcomplete": "^1.8.4", + "bower-angularjs": "angular.js#^1.3.15" }, "overrides": { "bootstrap": { diff --git a/config/assets/default.js b/config/assets/default.js index 592caa76..75b17917 100644 --- a/config/assets/default.js +++ b/config/assets/default.js @@ -76,7 +76,9 @@ module.exports = { //ngProgress 'public/lib/ngprogress/build/ngprogress.js', //jquery-awesome-cursor - 'public/lib/jquery-awesome-cursor/dist/jquery.awesome-cursor.js' + 'public/lib/jquery-awesome-cursor/dist/jquery.awesome-cursor.js', + //jquery-textcomplete + 'public/lib/jquery-textcomplete/dist/jquery.textcomplete.js' // endbower ], diff --git a/config/assets/production.js b/config/assets/production.js index c502d6f7..cf25d45d 100644 --- a/config/assets/production.js +++ b/config/assets/production.js @@ -76,7 +76,9 @@ module.exports = { //ngProgress 'public/lib/ngprogress/build/ngprogress.min.js', //jquery-awesome-cursor - 'public/lib/jquery-awesome-cursor/dist/jquery.awesome-cursor.min.js' + 'public/lib/jquery-awesome-cursor/dist/jquery.awesome-cursor.min.js', + //jquery-textcomplete + 'public/lib/jquery-textcomplete/dist/jquery.textcomplete.min.js' // endbower ] diff --git a/modules/core/client/app/init.js b/modules/core/client/app/init.js index de62e622..dc5b00f5 100644 --- a/modules/core/client/app/init.js +++ b/modules/core/client/app/init.js @@ -93,27 +93,33 @@ table: function (header, body) { return '' + header + '' + body + '
'; }, + paragraph: function (text) { + return '

' + replaceEmoji(text) + '

'; + }, text: function (text) { - var RexStr = /:([A-Za-z0-9_\-\+]+?):/g; - text = text.replace(RexStr, function (match, emoji) { - return ''
-            + emoji
-            + ''; - }); - - return text; + return replaceEmoji(text); } }); } + function replaceEmoji(text) { + var RexStr = /:([A-Za-z0-9_\-\+]+?):/g; + text = text.replace(RexStr, function (match, emoji) { + return ''
+        + emoji
+        + ''; + }); + return text; + } + // Then define the init function for starting up the application angular.element(document).ready(init); diff --git a/modules/core/server/views/layout.server.view.html b/modules/core/server/views/layout.server.view.html index 7aee257c..cbd1a554 100644 --- a/modules/core/server/views/layout.server.view.html +++ b/modules/core/server/views/layout.server.view.html @@ -74,6 +74,8 @@ {{#each jsFiles}}{{/each}} + +