{"action":"created","comment":{"url":"https://api.github.com/repos/clappr/clappr/pulls/comments/35828490","id":35828490,"diff_hunk":"@@ -28,7 +28,16 @@ var formatTime = function(time) {\n     var minutes = time % 60\n     time = parseInt(time/60)\n     var hours = time % 24\n+    var days = parseInt(time/24)\n     var out = \"\"\n+<<<<<<< HEAD\n+    if (days && days > 0) {\n+      out += days + \":\"\n+      if (hours < 1) out += \"00:\"","path":"src/base/utils.js","position":9,"original_position":9,"commit_id":"8faa10672b686fe2dcbfe73fac05ce8d2fc41fbc","original_commit_id":"8faa10672b686fe2dcbfe73fac05ce8d2fc41fbc","user":{"login":"houndci","id":6697940,"avatar_url":"https://avatars.githubusercontent.com/u/6697940?v=3","gravatar_id":"","url":"https://api.github.com/users/houndci","html_url":"https://github.com/houndci","followers_url":"https://api.github.com/users/houndci/followers","following_url":"https://api.github.com/users/houndci/following{/other_user}","gists_url":"https://api.github.com/users/houndci/gists{/gist_id}","starred_url":"https://api.github.com/users/houndci/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/houndci/subscriptions","organizations_url":"https://api.github.com/users/houndci/orgs","repos_url":"https://api.github.com/users/houndci/repos","events_url":"https://api.github.com/users/houndci/events{/privacy}","received_events_url":"https://api.github.com/users/houndci/received_events","type":"User","site_admin":false},"body":"Expected '{' and instead saw 'out'.","created_at":"2015-07-30T00:40:03Z","updated_at":"2015-07-30T00:40:03Z","html_url":"https://github.com/clappr/clappr/pull/505#discussion_r35828490","pull_request_url":"https://api.github.com/repos/clappr/clappr/pulls/505","_links":{"self":{"href":"https://api.github.com/repos/clappr/clappr/pulls/comments/35828490"},"html":{"href":"https://github.com/clappr/clappr/pull/505#discussion_r35828490"},"pull_request":{"href":"https://api.github.com/repos/clappr/clappr/pulls/505"}}},"pull_request":{"url":"https://api.github.com/repos/clappr/clappr/pulls/505","id":40857817,"html_url":"https://github.com/clappr/clappr/pull/505","diff_url":"https://github.com/clappr/clappr/pull/505.diff","patch_url":"https://github.com/clappr/clappr/pull/505.patch","issue_url":"https://api.github.com/repos/clappr/clappr/issues/505","number":505,"state":"open","locked":false,"title":"utils: added days to formatTime function","user":{"login":"derrod","id":3123295,"avatar_url":"https://avatars.githubusercontent.com/u/3123295?v=3","gravatar_id":"","url":"https://api.github.com/users/derrod","html_url":"https://github.com/derrod","followers_url":"https://api.github.com/users/derrod/followers","following_url":"https://api.github.com/users/derrod/following{/other_user}","gists_url":"https://api.github.com/users/derrod/gists{/gist_id}","starred_url":"https://api.github.com/users/derrod/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/derrod/subscriptions","organizations_url":"https://api.github.com/users/derrod/orgs","repos_url":"https://api.github.com/users/derrod/repos","events_url":"https://api.github.com/users/derrod/events{/privacy}","received_events_url":"https://api.github.com/users/derrod/received_events","type":"User","site_admin":false},"body":"This is a change I made for my use case with a playlist longer than 24 hours (HLS based DVR).\r\n\r\nAt 27 hours the timeline will now display as `1:03:00:00` instead of `03:00:00`. This fixes the visual bug where the timeline starts at 0 after the first 24 hours.\r\n\r\nAlternatively you could just display the full hours (i.e. `27:00:00`). However this seemed like a more elegant solution.","created_at":"2015-07-26T18:57:19Z","updated_at":"2015-07-30T00:40:03Z","closed_at":null,"merged_at":null,"merge_commit_sha":"a4c74f0f553b3197ee513c1540a5617008e2fe0e","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/clappr/clappr/pulls/505/commits","review_comments_url":"https://api.github.com/repos/clappr/clappr/pulls/505/comments","review_comment_url":"https://api.github.com/repos/clappr/clappr/pulls/comments{/number}","comments_url":"https://api.github.com/repos/clappr/clappr/issues/505/comments","statuses_url":"https://api.github.com/repos/clappr/clappr/statuses/8faa10672b686fe2dcbfe73fac05ce8d2fc41fbc","head":{"label":"derrod:master","ref":"master","sha":"8faa10672b686fe2dcbfe73fac05ce8d2fc41fbc","user":{"login":"derrod","id":3123295,"avatar_url":"https://avatars.githubusercontent.com/u/3123295?v=3","gravatar_id":"","url":"https://api.github.com/users/derrod","html_url":"https://github.com/derrod","followers_url":"https://api.github.com/users/derrod/followers","following_url":"https://api.github.com/users/derrod/following{/other_user}","gists_url":"https://api.github.com/users/derrod/gists{/gist_id}","starred_url":"https://api.github.com/users/derrod/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/derrod/subscriptions","organizations_url":"https://api.github.com/users/derrod/orgs","repos_url":"https://api.github.com/users/derrod/repos","events_url":"https://api.github.com/users/derrod/events{/privacy}","received_events_url":"https://api.github.com/users/derrod/received_events","type":"User","site_admin":false},"repo":{"id":39737238,"name":"clappr","full_name":"derrod/clappr","owner":{"login":"derrod","id":3123295,"avatar_url":"https://avatars.githubusercontent.com/u/3123295?v=3","gravatar_id":"","url":"https://api.github.com/users/derrod","html_url":"https://github.com/derrod","followers_url":"https://api.github.com/users/derrod/followers","following_url":"https://api.github.com/users/derrod/following{/other_user}","gists_url":"https://api.github.com/users/derrod/gists{/gist_id}","starred_url":"https://api.github.com/users/derrod/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/derrod/subscriptions","organizations_url":"https://api.github.com/users/derrod/orgs","repos_url":"https://api.github.com/users/derrod/repos","events_url":"https://api.github.com/users/derrod/events{/privacy}","received_events_url":"https://api.github.com/users/derrod/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/derrod/clappr","description":"An extensible media player for the web","fork":true,"url":"https://api.github.com/repos/derrod/clappr","forks_url":"https://api.github.com/repos/derrod/clappr/forks","keys_url":"https://api.github.com/repos/derrod/clappr/keys{/key_id}","collaborators_url":"https://api.github.com/repos/derrod/clappr/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/derrod/clappr/teams","hooks_url":"https://api.github.com/repos/derrod/clappr/hooks","issue_events_url":"https://api.github.com/repos/derrod/clappr/issues/events{/number}","events_url":"https://api.github.com/repos/derrod/clappr/events","assignees_url":"https://api.github.com/repos/derrod/clappr/assignees{/user}","branches_url":"https://api.github.com/repos/derrod/clappr/branches{/branch}","tags_url":"https://api.github.com/repos/derrod/clappr/tags","blobs_url":"https://api.github.com/repos/derrod/clappr/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/derrod/clappr/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/derrod/clappr/git/refs{/sha}","trees_url":"https://api.github.com/repos/derrod/clappr/git/trees{/sha}","statuses_url":"https://api.github.com/repos/derrod/clappr/statuses/{sha}","languages_url":"https://api.github.com/repos/derrod/clappr/languages","stargazers_url":"https://api.github.com/repos/derrod/clappr/stargazers","contributors_url":"https://api.github.com/repos/derrod/clappr/contributors","subscribers_url":"https://api.github.com/repos/derrod/clappr/subscribers","subscription_url":"https://api.github.com/repos/derrod/clappr/subscription","commits_url":"https://api.github.com/repos/derrod/clappr/commits{/sha}","git_commits_url":"https://api.github.com/repos/derrod/clappr/git/commits{/sha}","comments_url":"https://api.github.com/repos/derrod/clappr/comments{/number}","issue_comment_url":"https://api.github.com/repos/derrod/clappr/issues/comments{/number}","contents_url":"https://api.github.com/repos/derrod/clappr/contents/{+path}","compare_url":"https://api.github.com/repos/derrod/clappr/compare/{base}...{head}","merges_url":"https://api.github.com/repos/derrod/clappr/merges","archive_url":"https://api.github.com/repos/derrod/clappr/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/derrod/clappr/downloads","issues_url":"https://api.github.com/repos/derrod/clappr/issues{/number}","pulls_url":"https://api.github.com/repos/derrod/clappr/pulls{/number}","milestones_url":"https://api.github.com/repos/derrod/clappr/milestones{/number}","notifications_url":"https://api.github.com/repos/derrod/clappr/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/derrod/clappr/labels{/name}","releases_url":"https://api.github.com/repos/derrod/clappr/releases{/id}","created_at":"2015-07-26T18:44:10Z","updated_at":"2015-07-26T18:44:10Z","pushed_at":"2015-07-30T00:39:59Z","git_url":"git://github.com/derrod/clappr.git","ssh_url":"git@github.com:derrod/clappr.git","clone_url":"https://github.com/derrod/clappr.git","svn_url":"https://github.com/derrod/clappr","homepage":"http://clappr.io","size":97271,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"clappr:master","ref":"master","sha":"b0d40766496615ae064723207af745ed39e80145","user":{"login":"clappr","id":10685859,"avatar_url":"https://avatars.githubusercontent.com/u/10685859?v=3","gravatar_id":"","url":"https://api.github.com/users/clappr","html_url":"https://github.com/clappr","followers_url":"https://api.github.com/users/clappr/followers","following_url":"https://api.github.com/users/clappr/following{/other_user}","gists_url":"https://api.github.com/users/clappr/gists{/gist_id}","starred_url":"https://api.github.com/users/clappr/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/clappr/subscriptions","organizations_url":"https://api.github.com/users/clappr/orgs","repos_url":"https://api.github.com/users/clappr/repos","events_url":"https://api.github.com/users/clappr/events{/privacy}","received_events_url":"https://api.github.com/users/clappr/received_events","type":"Organization","site_admin":false},"repo":{"id":16844474,"name":"clappr","full_name":"clappr/clappr","owner":{"login":"clappr","id":10685859,"avatar_url":"https://avatars.githubusercontent.com/u/10685859?v=3","gravatar_id":"","url":"https://api.github.com/users/clappr","html_url":"https://github.com/clappr","followers_url":"https://api.github.com/users/clappr/followers","following_url":"https://api.github.com/users/clappr/following{/other_user}","gists_url":"https://api.github.com/users/clappr/gists{/gist_id}","starred_url":"https://api.github.com/users/clappr/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/clappr/subscriptions","organizations_url":"https://api.github.com/users/clappr/orgs","repos_url":"https://api.github.com/users/clappr/repos","events_url":"https://api.github.com/users/clappr/events{/privacy}","received_events_url":"https://api.github.com/users/clappr/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/clappr/clappr","description":"An extensible media player for the web","fork":false,"url":"https://api.github.com/repos/clappr/clappr","forks_url":"https://api.github.com/repos/clappr/clappr/forks","keys_url":"https://api.github.com/repos/clappr/clappr/keys{/key_id}","collaborators_url":"https://api.github.com/repos/clappr/clappr/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/clappr/clappr/teams","hooks_url":"https://api.github.com/repos/clappr/clappr/hooks","issue_events_url":"https://api.github.com/repos/clappr/clappr/issues/events{/number}","events_url":"https://api.github.com/repos/clappr/clappr/events","assignees_url":"https://api.github.com/repos/clappr/clappr/assignees{/user}","branches_url":"https://api.github.com/repos/clappr/clappr/branches{/branch}","tags_url":"https://api.github.com/repos/clappr/clappr/tags","blobs_url":"https://api.github.com/repos/clappr/clappr/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/clappr/clappr/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/clappr/clappr/git/refs{/sha}","trees_url":"https://api.github.com/repos/clappr/clappr/git/trees{/sha}","statuses_url":"https://api.github.com/repos/clappr/clappr/statuses/{sha}","languages_url":"https://api.github.com/repos/clappr/clappr/languages","stargazers_url":"https://api.github.com/repos/clappr/clappr/stargazers","contributors_url":"https://api.github.com/repos/clappr/clappr/contributors","subscribers_url":"https://api.github.com/repos/clappr/clappr/subscribers","subscription_url":"https://api.github.com/repos/clappr/clappr/subscription","commits_url":"https://api.github.com/repos/clappr/clappr/commits{/sha}","git_commits_url":"https://api.github.com/repos/clappr/clappr/git/commits{/sha}","comments_url":"https://api.github.com/repos/clappr/clappr/comments{/number}","issue_comment_url":"https://api.github.com/repos/clappr/clappr/issues/comments{/number}","contents_url":"https://api.github.com/repos/clappr/clappr/contents/{+path}","compare_url":"https://api.github.com/repos/clappr/clappr/compare/{base}...{head}","merges_url":"https://api.github.com/repos/clappr/clappr/merges","archive_url":"https://api.github.com/repos/clappr/clappr/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/clappr/clappr/downloads","issues_url":"https://api.github.com/repos/clappr/clappr/issues{/number}","pulls_url":"https://api.github.com/repos/clappr/clappr/pulls{/number}","milestones_url":"https://api.github.com/repos/clappr/clappr/milestones{/number}","notifications_url":"https://api.github.com/repos/clappr/clappr/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/clappr/clappr/labels{/name}","releases_url":"https://api.github.com/repos/clappr/clappr/releases{/id}","created_at":"2014-02-14T17:36:40Z","updated_at":"2015-07-28T20:34:13Z","pushed_at":"2015-07-30T00:39:59Z","git_url":"git://github.com/clappr/clappr.git","ssh_url":"git@github.com:clappr/clappr.git","clone_url":"https://github.com/clappr/clappr.git","svn_url":"https://github.com/clappr/clappr","homepage":"http://clappr.io","size":97271,"stargazers_count":2313,"watchers_count":2313,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":194,"mirror_url":null,"open_issues_count":30,"forks":194,"open_issues":30,"watchers":2313,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/clappr/clappr/pulls/505"},"html":{"href":"https://github.com/clappr/clappr/pull/505"},"issue":{"href":"https://api.github.com/repos/clappr/clappr/issues/505"},"comments":{"href":"https://api.github.com/repos/clappr/clappr/issues/505/comments"},"review_comments":{"href":"https://api.github.com/repos/clappr/clappr/pulls/505/comments"},"review_comment":{"href":"https://api.github.com/repos/clappr/clappr/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/clappr/clappr/pulls/505/commits"},"statuses":{"href":"https://api.github.com/repos/clappr/clappr/statuses/8faa10672b686fe2dcbfe73fac05ce8d2fc41fbc"}}}}