Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes made to the calcontroller.js file for sharing multiple tokens #765

Closed
wants to merge 7 commits into from
Closed

Changes made to the calcontroller.js file for sharing multiple tokens #765

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
df74643
Changes made to the calcontroller.js file for sharing multiple tokens
arunikayadav42 Mar 11, 2018
356ea35
Changes made to the calcontroller.js file for sharing multiple tokens…
arunikayadav42 Mar 11, 2018
b9accfc
Changes made to the calcontroller.js file with the for loop made more…
arunikayadav42 Mar 11, 2018
630a584
indentation made proper in the calcontroller.js file
arunikayadav42 Mar 13, 2018
7547102
further indentation made in the calcontroller.js file
arunikayadav42 Mar 13, 2018
2f18a6a
Extra spaces at the end of the line removed
arunikayadav42 Mar 17, 2018
c40daa2
push function added to append multiple calendars
arunikayadav42 Mar 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions js/app/controllers/calcontroller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,15 +140,18 @@ app.controller('CalController', ['$scope', 'Calendar', 'CalendarService', 'VEven
$scope.$apply();
});
} else {
$scope.calendarsPromise = CalendarService.getPublicCalendar(constants.publicSharingToken).then(function(calendar) {
constants.publicSharingToken.split(".").forEach(token=>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add spaces before and after token, and I think it should be inside some parenthesis.

{
$scope.calendarsPromise = CalendarService.getPublicCalendar(token).then(function(calendar) {
$scope.calendars = [calendar];
});
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm sorry, but the indentation is still wrong. This should be indented by one tab.

is.loading = false;
// TODO - scope.apply should not be necessary here
$scope.$apply();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please only call is.loading = false and $scope.$apply(); once all calendars are done loading and not for each individually.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These two lines are still called for each calendar. Please only call them once all calendars loaded.

To make sure they are called after all are done, you need to create an array with all CalendarService.getPublicCalendar(token) promises and do a Promise.all() on the array.

For more information about Promise functions see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/all

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Furthermore the catch is currently called on the forEach function. It has to be called on the Promise instead.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will look into the same :)

}).catch((reason) => {
}).catch((reason) => {
angular.element('#header-right').css('display', 'none');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to be indent issues here. Does your editor understands .editorconfig files (maybe with a plugin) ?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tcitworld I am using sublime text to edit the code, can you please explain why my pull request can't be merged :)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Install this package : https://packagecontrol.io/packages/EditorConfig

There's a few indenting issues I see (when opening a bracket, add a new line indented).

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have installed the package and restarted the sublime text but still cannot see any changes made in the indentation of the code.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't use Sublime Text for a while, doesn't it shows some errors somehow ?

Don't bother too much for this, I'll fix these kind of typos afterwards.

angular.element('#emptycontent-container').css('display', 'block');
});
});
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove spaces here

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove spaces added at the end of the line.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it alright now or do I further look into the indentation ,please tell :)

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@arunikayadav42 No, its still there. Remove spaces added at the end of the line.

}


Expand Down