summaryrefslogtreecommitdiff
path: root/www/js/app.js
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2016-11-28 14:03:13 -0500
committerPliable Pixels <pliablepixels@gmail.com>2016-11-28 14:03:13 -0500
commit76ed15b904463247bcd799b0116380ee4a1ddb6d (patch)
treeb3d82068e6a2dc03447b80c064fa655d5f7df90f /www/js/app.js
parent010e28c69d86c48b33715fa67c972a4d4e49bee4 (diff)
modifications for picking up feeds from new zmNinja medium blog
Diffstat (limited to 'www/js/app.js')
-rw-r--r--www/js/app.js36
1 files changed, 21 insertions, 15 deletions
diff --git a/www/js/app.js b/www/js/app.js
index 1b30dea7..81e26253 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -78,7 +78,7 @@ angular.module('zmApp', [
desktopUrl: "/zm",
desktopApiUrl: "/api/zm",
latestRelease: "https://api.github.com/repos/pliablepixels/zmNinja/releases/latest",
- blogUrl: "http://pliablepixels.github.io/feed.json",
+ blogUrl: "https://medium.com/zmninja/latest?format=json",
nphSwitchTimer: 3000,
eventHistoryTimer: 5000,
eventPlaybackQuery: 3000,
@@ -696,11 +696,21 @@ angular.module('zmApp', [
});
NVRDataModel.log("Checking for news updates");
- $http.get(zm.blogUrl)
- .success(function(data)
+ $http.get(zm.blogUrl,
+ {transformResponse: function(d,h)
+ {
+ var trunc = "])}while(1);</x>";
+ d = d.substr(trunc.length);
+ return d;
+ }
+ })
+
+ .success(function(datastr)
{
+
+ var data = JSON.parse(datastr);
$rootScope.newBlogPost = "";
- if (data.length <= 0)
+ if (data.payload.posts.length <= 0)
{
$rootScope.newBlogPost = "";
return;
@@ -716,23 +726,19 @@ angular.module('zmApp', [
}
var mLastDate = moment(lastDate);
- var mItemDate = moment(data[0].date);
+ var mItemDate = moment(data.payload.posts[0].createdAt);
if (mItemDate.diff(mLastDate) > 0)
{
- NVRDataModel.debug("New post dated " + data[0].date + " found");
- if (data[0].level == "critical")
- {
- $rootScope.newBlogPost = "(new post)";
- }
- else
- {
- NVRDataModel.debug("Not showing a notification in menu as this is not critical");
- }
+ NVRDataModel.debug("New post dated " + mItemDate.format("YYYY-MM-DD HH:mm:ss") + " found");
+
+ $rootScope.newBlogPost = "(new post)";
+
+
}
else
{
- NVRDataModel.debug("Latest post dated " + data[0].date + " but you read " + lastDate);
+ NVRDataModel.debug("Latest post dated " + mItemDate.format("YYYY-MM-DD HH:mm:ss") + " but you read " + lastDate);
}
});