Skip to content

Commit

Permalink
Merge pull request #10 from sakshityagi/master
Browse files Browse the repository at this point in the history
Shown the dummy data on initial load when there is no data
  • Loading branch information
DanielHindi committed Apr 4, 2016
2 parents 4f5231f + bf10802 commit e66b4d1
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 18 deletions.
26 changes: 16 additions & 10 deletions control/content/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,22 @@
ContentHome.init = function () {
ContentHome.success = function (result) {
console.info('init success result:', result);
if (Object.keys(result.data).length > 0) {
ContentHome.data = result.data;
}
if (ContentHome.data) {
if (!ContentHome.data.content)
ContentHome.data.content = {};
if (ContentHome.data.content.docUrl)
ContentHome.docUrl = ContentHome.data.content.docUrl;
if (ContentHome.data.content.mode)
ContentHome.mode = ContentHome.data.content.mode;
if(result.data && result.id) {
if (Object.keys(result.data).length > 0) {
ContentHome.data = result.data;
}
if (ContentHome.data) {
if (!ContentHome.data.content)
ContentHome.data.content = {};
if (ContentHome.data.content.docUrl)
ContentHome.docUrl = ContentHome.data.content.docUrl;
if (ContentHome.data.content.mode)
ContentHome.mode = ContentHome.data.content.mode;
}
}else {
var dummyData = {url: "https://docs.google.com/document/d/1SqWeU4ewzXQBpR98TYGiBZ_iPdQH92wOb7jT0y-_Cbc/pub"};
ContentHome.docUrl = ContentHome.data.content.url = dummyData.url;
ContentHome.mode = ContentHome.MODE_TYPE.PREVIEW;
}
};
ContentHome.error = function (err) {
Expand Down
25 changes: 17 additions & 8 deletions widget/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,23 @@
*/
WidgetHome.init = function () {
WidgetHome.success = function (result) {
WidgetHome.data = result.data;
if (!WidgetHome.data.content)
WidgetHome.data.content = {};
if (WidgetHome.data.content.mode && WidgetHome.data.content.docUrl && WidgetHome.data.content.mode == 'preview')
WidgetHome.data.content.docUrl = WidgetHome.data.content.docUrl.replace('/edit', '/mobilebasic');
else if ((WidgetHome.data.content.mode && WidgetHome.data.content.docUrl && WidgetHome.data.content.mode == 'editable'))
WidgetHome.data.content.docUrl = WidgetHome.data.content.docUrl.replace('/mobilebasic', '/edit');
console.log(">>>>>", WidgetHome.data);
if(result.data && result.id) {
WidgetHome.data = result.data;
if (!WidgetHome.data.content)
WidgetHome.data.content = {};
if (WidgetHome.data.content.mode && WidgetHome.data.content.docUrl && WidgetHome.data.content.mode == 'preview')
WidgetHome.data.content.docUrl = WidgetHome.data.content.docUrl.replace('/edit', '/mobilebasic');
else if ((WidgetHome.data.content.mode && WidgetHome.data.content.docUrl && WidgetHome.data.content.mode == 'editable'))
WidgetHome.data.content.docUrl = WidgetHome.data.content.docUrl.replace('/mobilebasic', '/edit');
console.log(">>>>>", WidgetHome.data);
}else
{
WidgetHome.data = {
content: {}
};
var dummyData = {url: "https://docs.google.com/document/d/1SqWeU4ewzXQBpR98TYGiBZ_iPdQH92wOb7jT0y-_Cbc/pub"};
WidgetHome.data.content.docUrl = dummyData.url;
}
};
WidgetHome.error = function (err) {
if (err && err.code !== STATUS_CODE.NOT_FOUND) {
Expand Down

0 comments on commit e66b4d1

Please sign in to comment.