diff --git a/lib/tags/messages.tag b/lib/tags/messages.tag
index 3a9c2b3..b6bfba4 100644
--- a/lib/tags/messages.tag
+++ b/lib/tags/messages.tag
@@ -39,7 +39,7 @@
-
{activeMessages[message].message}
+
{this.filterOut(activeMessages[message].message)}
@@ -205,6 +205,12 @@
this.update();
this.handleUser();
}
+ this.filterOut = (message) => {
+ if(opts.filterOut=="")
+ return message;
+ var re = new RegExp("\\b("+opts.filterOut+")\\b", "g");
+ return message.replace(re, "...");
+ }
this.handleUser = () => {
let self = this;
getSession(function(response) {
diff --git a/lib/tags/profile-settings.tag b/lib/tags/profile-settings.tag
index 2bd16a3..e6f5312 100644
--- a/lib/tags/profile-settings.tag
+++ b/lib/tags/profile-settings.tag
@@ -117,6 +117,7 @@
hideOverlay();
self.update();
self.parent.tags.hasOwnProperty('graphjs-profile-header') && self.parent.tags['graphjs-profile-header'].updateInformation();
+ window.GraphJS.remountRiotTags('*');
} else {
self.successMessages.includes(successMessage) && self.successMessages.splice(self.successMessages.indexOf(successMessage), 1);
self.failMessages.includes(failMessage) || self.failMessages.push(failMessage);
diff --git a/lib/tags/star-button.tag b/lib/tags/star-button.tag
index 0377339..f4d50c1 100644
--- a/lib/tags/star-button.tag
+++ b/lib/tags/star-button.tag
@@ -15,7 +15,7 @@
-
0} class="graphjs-text">
+
0 || !hideZero} class="graphjs-text">
{count}
@@ -26,6 +26,7 @@
import getStar from '../scripts/getStar.js';
import getStars from '../scripts/getStars.js';
import removeStar from '../scripts/removeStar.js';
+ import getSession from '../scripts/getSession.js';
analytics("star-button");
@@ -33,10 +34,13 @@
this.type = opts.type || 'default';
this.boxStyle = opts.box == 'disabled' ? 'graphjs-inline' : 'graphjs-box';
this.count = 0;
+ this.hideZero = (opts.hideZero && opts.hideZero == "on")
+ this.ref = opts.href || window.location.href;
+ this.authenticationText = opts.authenticationText || "Authentication Required";
this.on('before-mount', function() {
let self = this;
- getStar(window.location.href, function(response) {
+ getStar(self.ref, function(response) {
if(response.success) {
if(response.starred) {
self.active = true;
@@ -51,38 +55,45 @@
this.handleStar = (event) => {
event.preventDefault();
let self = this;
- if(!self.active) {
- self.active = true;
- self.count++;
- self.update();
- star(
- window.location.href,
- function(response) {
- if(!response.success) {
- self.active = false;
- self.count--;
- }
- self.count = response.count;
+ getSession(function(response) {
+ if(response.success) {
+ if(!self.active) {
+ self.active = true;
+ self.count++;
self.update();
- }
- );
- } else {
- self.active = false;
- self.count--;
- self.update();
- removeStar(
- window.location.href,
- function(response) {
- if(!response.success) {
- self.active = true;
- self.count++;
- }
- self.count = response.count;
+ star(
+ self.ref,
+ function(response) {
+ if(!response.success) {
+ self.active = false;
+ self.count--;
+ }
+ self.count = response.count || 0;
+ self.update();
+ }
+ );
+ } else {
+ self.active = false;
+ self.count--;
self.update();
+ removeStar(
+ self.ref,
+ function(response) {
+ if(!response.success) {
+ self.active = true;
+ self.count++;
+ }
+ self.count = response.count || 0;
+ self.update();
+ }
+ );
}
- );
- }
-
+ } else {
+ GraphJS.showRegister({
+ title: self.authenticationText
+ });
+ }
+ });
}
\ No newline at end of file
diff --git a/lib/tagsImports.js b/lib/tagsImports.js
index 785dcbc..1b86aef 100644
--- a/lib/tagsImports.js
+++ b/lib/tagsImports.js
@@ -167,6 +167,7 @@ import getPrivateContent from './scripts/getPrivateContent.js';
import removePrivateContent from './scripts/removePrivateContent.js';
import editPrivateContent from './scripts/editPrivateContent.js';
import addPrivateContent from './scripts/addPrivateContent.js';
+import listPrivateContents from './scripts/listPrivateContents.js';
// stripe
import createSubscription from './scripts/createSubscription.js';
@@ -197,7 +198,7 @@ export default {
// star
star, getStar, getStars, getUserStars, removeStar,
// private
- getPrivateContent, removePrivateContent, editPrivateContent, addPrivateContent,
+ getPrivateContent, removePrivateContent, editPrivateContent, addPrivateContent, listPrivateContents,
// stripe
createSubscription, checkSubscription, tokenLogin,
}
\ No newline at end of file
diff --git a/package.json b/package.json
index e7d2c5b..b47f261 100755
--- a/package.json
+++ b/package.json
@@ -1,11 +1,11 @@
{
"name": "graphjs",
"version": "",
- "description": "",
- "repository": "",
+ "description": "A set of widgets for a meaningfully social web",
+ "repository": "https://github.com/phonetworks/graphjs",
"main": "webpack.config.js",
- "author": "",
- "license": "",
+ "author": "Emre Sokullu",
+ "license": "AGPL-3.0",
"engines": {
"node": ">=4.0.0"
},
@@ -24,7 +24,7 @@
"dependencies": {
"@types/nanoevents": "^1.0.0",
"autolinker": "^3.0.5",
- "axios": "0.18.1",
+ "axios": "^0.18.1",
"babel-core": "^6.26.0",
"babel-loader": "^7.1.2",
"babel-preset-es2015-riot": "^1.1.0",
@@ -43,6 +43,7 @@
"nanoevents": "^1.0.5",
"opencollective-postinstall": "^2.0.2",
"pell": "^1.0.4",
+ "q": "^1.5.1",
"riot": "^3.13.2",
"sanitize-html": "^1.19.2",
"tiny-date-picker": "^3.2.8",
diff --git a/prepare.js b/prepare.js
index 3aa66b6..087d7aa 100644
--- a/prepare.js
+++ b/prepare.js
@@ -190,6 +190,7 @@ const import_scripts={
"removePrivateContent",
"editPrivateContent",
"addPrivateContent",
+ "listPrivateContents",
],
stripe: [
"createSubscription",
diff --git a/test/index-comments.html b/test/index-comments.html
new file mode 100644
index 0000000..98427b4
--- /dev/null
+++ b/test/index-comments.html
@@ -0,0 +1,28 @@
+
+
+
+
+
+
Test GraphJS Components
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/index-single.html b/test/index-single.html
index 84f32c1..3ebec2f 100644
--- a/test/index-single.html
+++ b/test/index-single.html
@@ -16,6 +16,9 @@
+
+
+
@@ -36,8 +39,9 @@