Merge branch 'release/0.9.6'

FlorianMaak · Apr 30, 2018 · 5bcee5b · 5bcee5b
2 parents 3f04909 + a12ee1e
commit 5bcee5b
Show file tree

Hide file tree

Showing 8 changed files with 143 additions and 1,094 deletions.
diff --git a/dist/p0weruser.user.js b/dist/p0weruser.user.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,50 +1,50 @@
 {
-  "name":            "p0weruser",
-  "description":     "A modularized userScript for pr0gramm.com",
-  "homepage":        "https://github.com/FlorianMaak/p0weruser",
-  "author":          {
-    "name":  "Florian Maak",
+  "name": "p0weruser",
+  "description": "A modularized userScript for pr0gramm.com",
+  "homepage": "https://github.com/FlorianMaak/p0weruser",
+  "author": {
+    "name": "Florian Maak",
     "email": "[email protected]"
   },
-  "keywords":        [
+  "keywords": [
     "UserScript",
     "TaperMonkey",
     "pr0gramm"
   ],
-  "version":         "0.9.5",
-  "license":         "GPL-3.0",
-  "dependencies":    {
-    "chart.js":     "^2.7.2",
-    "moment":       "^2.22.0",
-    "simplebar":    "^2.5.1",
+  "version": "0.9.6",
+  "license": "GPL-3.0",
+  "dependencies": {
+    "chart.js": "^2.7.2",
+    "moment": "^2.22.0",
+    "simplebar": "^2.5.1",
     "tesseract.js": "^1.0.10"
   },
   "devDependencies": {
-    "ajv":                         "^6.2.1",
-    "css-loader":                  "^0.28.10",
-    "html-loader":                 "^0.5.5",
-    "less":                        "^3.0.1",
-    "less-loader":                 "^4.1.0",
-    "style-loader":                "^0.20.3",
-    "webpack":                     "^4.1.1",
-    "webpack-cli":                 "^2.0.11",
+    "ajv": "^6.2.1",
+    "css-loader": "^0.28.10",
+    "html-loader": "^0.5.5",
+    "less": "^3.0.2",
+    "less-loader": "^4.1.0",
+    "style-loader": "^0.20.3",
+    "webpack": "^4.1.1",
+    "webpack-cli": "^2.0.11",
     "webpack-auto-inject-version": "^1.0.0"
   },
-  "bugs":            {
-    "url":   "https://github.com/FlorianMaak/p0weruser/issues",
+  "bugs": {
+    "url": "https://github.com/FlorianMaak/p0weruser/issues",
     "email": "[email protected]"
   },
-  "engines":         {
+  "engines": {
     "node": ">=6.11.5"
   },
-  "repository":      {
+  "repository": {
     "type": "git",
-    "url":  "git+https://github.com/FlorianMaak/p0weruser"
+    "url": "git+https://github.com/FlorianMaak/p0weruser"
   },
-  "scripts":         {
+  "scripts": {
     "postinstall": "npm run build",
-    "dev":         "webpack  --config webpack.config.js --watch --mode development",
-    "build":       "webpack  --config webpack.config.js --mode production",
-    "test":        "webpack --config webpack.config.js"
+    "dev": "webpack  --config webpack.config.js --watch --mode development",
+    "build": "webpack  --config webpack.config.js --mode production",
+    "test": "webpack --config webpack.config.js"
   }
 }
diff --git a/src/lib/Pr0p0llDiagramm.js b/src/lib/Pr0p0llDiagramm.js
@@ -227,19 +227,21 @@ export default class Pr0p0llDiagramm {
 
         let count = 0;
         for (let key in resultData) {
-            let label = key;
+            if (resultData.hasOwnProperty(key)) {
+                let label = key;
 
-            if (this.wordings[resultKey]) {
-                label = this.wordings[resultKey][key];
-            }
+                if (this.wordings[resultKey]) {
+                    label = this.wordings[resultKey][key];
+                }
 
-            result.push({
-                label: Pr0p0llDiagramm.htmlDecode(label),
-                data: resultData[key],
-                backgroundColor: this.colors[count]
-            });
+                result.push({
+                    label: Pr0p0llDiagramm.htmlDecode(label),
+                    data: resultData[key],
+                    backgroundColor: this.colors[count]
+                });
 
-            count++;
+                count++;
+            }
         }
     }
 

diff --git a/src/module/Pr0p0ll.js b/src/module/Pr0p0ll.js
@@ -109,7 +109,7 @@ export default class Pr0p0ll {
                     method: 'GET',
                     onload: (res) => {
                         const response = JSON.parse(res.responseText);
-                        console.log(response);
+
                         if (response.error) {
                             reject(response.error);
                         }

diff --git a/src/style/pr0p0ll.less b/src/style/pr0p0ll.less
@@ -97,6 +97,10 @@
       text-align: center;
       text-transform: none;
       color: #888;
+
+      .white {
+        color: #f2f5f4;
+      }
     }
 
     small {

diff --git a/src/template/pr0p0llOverlay.html b/src/template/pr0p0llOverlay.html
@@ -9,8 +9,13 @@ <h3 class="center">
                title="Zur Umfrage" target="_blank">Zur Umfrage</a>
         </span>
         <span>
-            Author: <a href="//pr0gramm.com/user/<?js print(p0ll.info.author)?>"
-                       target="_blank"><?js print(p0ll.info.author)?></a>
+            Author:
+            <?js if (p0ll.info.author) { ?>
+            <a href="//pr0gramm.com/user/<?js print(p0ll.info.author)?>"
+               target="_blank"><?js print(p0ll.info.author)?></a>
+            <?js } else { ?>
+            <span class="white">Anonym</span>
+            <?js } ?>
         </span>
         <span>Zeitraum: <?js print(dateFrom)?> - <?js print(dateTo)?></span>
     </h3>

diff --git a/src/template/scriptHeader.txt b/src/template/scriptHeader.txt
@@ -5,7 +5,6 @@
 // @description	Erweitert pr0gramm.com um weitere Funktionen
 // @license     GPL-3.0; http://www.gnu.org/licenses/gpl-3.0.txt
 // @include		/^https?://pr0gramm.com/.*$/
-// @include		/^https://prep0st.rene8888.at.*$/
 // @icon		https://pr0gramm.com/media/pr0gramm-favicon.png
 // @connect     rep0st.rene8888.at
 // @connect     github.com