{"action":"created","comment":{"url":"https://api.github.com/repos/jdorn/json-editor/pulls/comments/59876331","id":59876331,"diff_hunk":"@@ -8,12 +8,17 @@ JSONEditor.defaults.editors.multiselect = JSONEditor.AbstractEditor.extend({\n     var items_schema = this.jsoneditor.expandRefs(this.schema.items || {});\n \n     var e = items_schema[\"enum\"] || [];\n+\tvar eTitles = items_schema.options.enum_titles || items_schema[\"enum\"] || [];\n+\t\n+\t\n     this.option_keys = [];\n+\tthis.option_titles = [];\n     for(i=0; i<e.length; i++) {\n       // If the sanitized value is different from the enum value, don't include it\n       if(this.sanitize(e[i]) !== e[i]) continue;\n \n       this.option_keys.push(e[i]+\"\");\n+\t  this.option_titles.push(eTitles[i]+\"\");","path":"src/editors/multiselect.js","position":14,"original_position":14,"commit_id":"1961a4b1aef3fbeee98a1ed86953347fed05f0f9","original_commit_id":"1961a4b1aef3fbeee98a1ed86953347fed05f0f9","user":{"login":"shugigo","id":11791575,"avatar_url":"https://avatars.githubusercontent.com/u/11791575?v=3","gravatar_id":"","url":"https://api.github.com/users/shugigo","html_url":"https://github.com/shugigo","followers_url":"https://api.github.com/users/shugigo/followers","following_url":"https://api.github.com/users/shugigo/following{/other_user}","gists_url":"https://api.github.com/users/shugigo/gists{/gist_id}","starred_url":"https://api.github.com/users/shugigo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/shugigo/subscriptions","organizations_url":"https://api.github.com/users/shugigo/orgs","repos_url":"https://api.github.com/users/shugigo/repos","events_url":"https://api.github.com/users/shugigo/events{/privacy}","received_events_url":"https://api.github.com/users/shugigo/received_events","type":"User","site_admin":false},"body":"How do I see the conflicts? Can I fix it on the current pull request?","created_at":"2016-04-15T13:49:34Z","updated_at":"2016-04-15T13:49:34Z","html_url":"https://github.com/jdorn/json-editor/pull/583#discussion_r59876331","pull_request_url":"https://api.github.com/repos/jdorn/json-editor/pulls/583","_links":{"self":{"href":"https://api.github.com/repos/jdorn/json-editor/pulls/comments/59876331"},"html":{"href":"https://github.com/jdorn/json-editor/pull/583#discussion_r59876331"},"pull_request":{"href":"https://api.github.com/repos/jdorn/json-editor/pulls/583"}}},"pull_request":{"url":"https://api.github.com/repos/jdorn/json-editor/pulls/583","id":66188693,"html_url":"https://github.com/jdorn/json-editor/pull/583","diff_url":"https://github.com/jdorn/json-editor/pull/583.diff","patch_url":"https://github.com/jdorn/json-editor/pull/583.patch","issue_url":"https://api.github.com/repos/jdorn/json-editor/issues/583","number":583,"state":"open","locked":false,"title":"Add multiselect support to enum_titles","user":{"login":"shugigo","id":11791575,"avatar_url":"https://avatars.githubusercontent.com/u/11791575?v=3","gravatar_id":"","url":"https://api.github.com/users/shugigo","html_url":"https://github.com/shugigo","followers_url":"https://api.github.com/users/shugigo/followers","following_url":"https://api.github.com/users/shugigo/following{/other_user}","gists_url":"https://api.github.com/users/shugigo/gists{/gist_id}","starred_url":"https://api.github.com/users/shugigo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/shugigo/subscriptions","organizations_url":"https://api.github.com/users/shugigo/orgs","repos_url":"https://api.github.com/users/shugigo/repos","events_url":"https://api.github.com/users/shugigo/events{/privacy}","received_events_url":"https://api.github.com/users/shugigo/received_events","type":"User","site_admin":false},"body":"","created_at":"2016-04-12T16:34:24Z","updated_at":"2016-04-15T13:49:34Z","closed_at":null,"merged_at":null,"merge_commit_sha":"5164d8582539a1e560dfc09315a5de49f08f26ff","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/jdorn/json-editor/pulls/583/commits","review_comments_url":"https://api.github.com/repos/jdorn/json-editor/pulls/583/comments","review_comment_url":"https://api.github.com/repos/jdorn/json-editor/pulls/comments{/number}","comments_url":"https://api.github.com/repos/jdorn/json-editor/issues/583/comments","statuses_url":"https://api.github.com/repos/jdorn/json-editor/statuses/1961a4b1aef3fbeee98a1ed86953347fed05f0f9","head":{"label":"shugigo:master","ref":"master","sha":"1961a4b1aef3fbeee98a1ed86953347fed05f0f9","user":{"login":"shugigo","id":11791575,"avatar_url":"https://avatars.githubusercontent.com/u/11791575?v=3","gravatar_id":"","url":"https://api.github.com/users/shugigo","html_url":"https://github.com/shugigo","followers_url":"https://api.github.com/users/shugigo/followers","following_url":"https://api.github.com/users/shugigo/following{/other_user}","gists_url":"https://api.github.com/users/shugigo/gists{/gist_id}","starred_url":"https://api.github.com/users/shugigo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/shugigo/subscriptions","organizations_url":"https://api.github.com/users/shugigo/orgs","repos_url":"https://api.github.com/users/shugigo/repos","events_url":"https://api.github.com/users/shugigo/events{/privacy}","received_events_url":"https://api.github.com/users/shugigo/received_events","type":"User","site_admin":false},"repo":{"id":55992306,"name":"json-editor","full_name":"shugigo/json-editor","owner":{"login":"shugigo","id":11791575,"avatar_url":"https://avatars.githubusercontent.com/u/11791575?v=3","gravatar_id":"","url":"https://api.github.com/users/shugigo","html_url":"https://github.com/shugigo","followers_url":"https://api.github.com/users/shugigo/followers","following_url":"https://api.github.com/users/shugigo/following{/other_user}","gists_url":"https://api.github.com/users/shugigo/gists{/gist_id}","starred_url":"https://api.github.com/users/shugigo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/shugigo/subscriptions","organizations_url":"https://api.github.com/users/shugigo/orgs","repos_url":"https://api.github.com/users/shugigo/repos","events_url":"https://api.github.com/users/shugigo/events{/privacy}","received_events_url":"https://api.github.com/users/shugigo/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/shugigo/json-editor","description":"JSON Schema Based Editor","fork":true,"url":"https://api.github.com/repos/shugigo/json-editor","forks_url":"https://api.github.com/repos/shugigo/json-editor/forks","keys_url":"https://api.github.com/repos/shugigo/json-editor/keys{/key_id}","collaborators_url":"https://api.github.com/repos/shugigo/json-editor/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/shugigo/json-editor/teams","hooks_url":"https://api.github.com/repos/shugigo/json-editor/hooks","issue_events_url":"https://api.github.com/repos/shugigo/json-editor/issues/events{/number}","events_url":"https://api.github.com/repos/shugigo/json-editor/events","assignees_url":"https://api.github.com/repos/shugigo/json-editor/assignees{/user}","branches_url":"https://api.github.com/repos/shugigo/json-editor/branches{/branch}","tags_url":"https://api.github.com/repos/shugigo/json-editor/tags","blobs_url":"https://api.github.com/repos/shugigo/json-editor/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/shugigo/json-editor/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/shugigo/json-editor/git/refs{/sha}","trees_url":"https://api.github.com/repos/shugigo/json-editor/git/trees{/sha}","statuses_url":"https://api.github.com/repos/shugigo/json-editor/statuses/{sha}","languages_url":"https://api.github.com/repos/shugigo/json-editor/languages","stargazers_url":"https://api.github.com/repos/shugigo/json-editor/stargazers","contributors_url":"https://api.github.com/repos/shugigo/json-editor/contributors","subscribers_url":"https://api.github.com/repos/shugigo/json-editor/subscribers","subscription_url":"https://api.github.com/repos/shugigo/json-editor/subscription","commits_url":"https://api.github.com/repos/shugigo/json-editor/commits{/sha}","git_commits_url":"https://api.github.com/repos/shugigo/json-editor/git/commits{/sha}","comments_url":"https://api.github.com/repos/shugigo/json-editor/comments{/number}","issue_comment_url":"https://api.github.com/repos/shugigo/json-editor/issues/comments{/number}","contents_url":"https://api.github.com/repos/shugigo/json-editor/contents/{+path}","compare_url":"https://api.github.com/repos/shugigo/json-editor/compare/{base}...{head}","merges_url":"https://api.github.com/repos/shugigo/json-editor/merges","archive_url":"https://api.github.com/repos/shugigo/json-editor/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/shugigo/json-editor/downloads","issues_url":"https://api.github.com/repos/shugigo/json-editor/issues{/number}","pulls_url":"https://api.github.com/repos/shugigo/json-editor/pulls{/number}","milestones_url":"https://api.github.com/repos/shugigo/json-editor/milestones{/number}","notifications_url":"https://api.github.com/repos/shugigo/json-editor/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/shugigo/json-editor/labels{/name}","releases_url":"https://api.github.com/repos/shugigo/json-editor/releases{/id}","deployments_url":"https://api.github.com/repos/shugigo/json-editor/deployments","created_at":"2016-04-11T17:20:27Z","updated_at":"2016-04-11T17:20:28Z","pushed_at":"2016-04-12T13:21:18Z","git_url":"git://github.com/shugigo/json-editor.git","ssh_url":"git@github.com:shugigo/json-editor.git","clone_url":"https://github.com/shugigo/json-editor.git","svn_url":"https://github.com/shugigo/json-editor","homepage":"","size":1838,"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":"jdorn:master","ref":"master","sha":"a3b9bfec31b9332a0b1f21e1b1c7f13fde92523e","user":{"login":"jdorn","id":1087514,"avatar_url":"https://avatars.githubusercontent.com/u/1087514?v=3","gravatar_id":"","url":"https://api.github.com/users/jdorn","html_url":"https://github.com/jdorn","followers_url":"https://api.github.com/users/jdorn/followers","following_url":"https://api.github.com/users/jdorn/following{/other_user}","gists_url":"https://api.github.com/users/jdorn/gists{/gist_id}","starred_url":"https://api.github.com/users/jdorn/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jdorn/subscriptions","organizations_url":"https://api.github.com/users/jdorn/orgs","repos_url":"https://api.github.com/users/jdorn/repos","events_url":"https://api.github.com/users/jdorn/events{/privacy}","received_events_url":"https://api.github.com/users/jdorn/received_events","type":"User","site_admin":false},"repo":{"id":14673229,"name":"json-editor","full_name":"jdorn/json-editor","owner":{"login":"jdorn","id":1087514,"avatar_url":"https://avatars.githubusercontent.com/u/1087514?v=3","gravatar_id":"","url":"https://api.github.com/users/jdorn","html_url":"https://github.com/jdorn","followers_url":"https://api.github.com/users/jdorn/followers","following_url":"https://api.github.com/users/jdorn/following{/other_user}","gists_url":"https://api.github.com/users/jdorn/gists{/gist_id}","starred_url":"https://api.github.com/users/jdorn/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jdorn/subscriptions","organizations_url":"https://api.github.com/users/jdorn/orgs","repos_url":"https://api.github.com/users/jdorn/repos","events_url":"https://api.github.com/users/jdorn/events{/privacy}","received_events_url":"https://api.github.com/users/jdorn/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/jdorn/json-editor","description":"JSON Schema Based Editor","fork":false,"url":"https://api.github.com/repos/jdorn/json-editor","forks_url":"https://api.github.com/repos/jdorn/json-editor/forks","keys_url":"https://api.github.com/repos/jdorn/json-editor/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jdorn/json-editor/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jdorn/json-editor/teams","hooks_url":"https://api.github.com/repos/jdorn/json-editor/hooks","issue_events_url":"https://api.github.com/repos/jdorn/json-editor/issues/events{/number}","events_url":"https://api.github.com/repos/jdorn/json-editor/events","assignees_url":"https://api.github.com/repos/jdorn/json-editor/assignees{/user}","branches_url":"https://api.github.com/repos/jdorn/json-editor/branches{/branch}","tags_url":"https://api.github.com/repos/jdorn/json-editor/tags","blobs_url":"https://api.github.com/repos/jdorn/json-editor/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jdorn/json-editor/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jdorn/json-editor/git/refs{/sha}","trees_url":"https://api.github.com/repos/jdorn/json-editor/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jdorn/json-editor/statuses/{sha}","languages_url":"https://api.github.com/repos/jdorn/json-editor/languages","stargazers_url":"https://api.github.com/repos/jdorn/json-editor/stargazers","contributors_url":"https://api.github.com/repos/jdorn/json-editor/contributors","subscribers_url":"https://api.github.com/repos/jdorn/json-editor/subscribers","subscription_url":"https://api.github.com/repos/jdorn/json-editor/subscription","commits_url":"https://api.github.com/repos/jdorn/json-editor/commits{/sha}","git_commits_url":"https://api.github.com/repos/jdorn/json-editor/git/commits{/sha}","comments_url":"https://api.github.com/repos/jdorn/json-editor/comments{/number}","issue_comment_url":"https://api.github.com/repos/jdorn/json-editor/issues/comments{/number}","contents_url":"https://api.github.com/repos/jdorn/json-editor/contents/{+path}","compare_url":"https://api.github.com/repos/jdorn/json-editor/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jdorn/json-editor/merges","archive_url":"https://api.github.com/repos/jdorn/json-editor/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jdorn/json-editor/downloads","issues_url":"https://api.github.com/repos/jdorn/json-editor/issues{/number}","pulls_url":"https://api.github.com/repos/jdorn/json-editor/pulls{/number}","milestones_url":"https://api.github.com/repos/jdorn/json-editor/milestones{/number}","notifications_url":"https://api.github.com/repos/jdorn/json-editor/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jdorn/json-editor/labels{/name}","releases_url":"https://api.github.com/repos/jdorn/json-editor/releases{/id}","deployments_url":"https://api.github.com/repos/jdorn/json-editor/deployments","created_at":"2013-11-25T01:30:00Z","updated_at":"2016-04-15T12:49:32Z","pushed_at":"2016-04-13T16:11:47Z","git_url":"git://github.com/jdorn/json-editor.git","ssh_url":"git@github.com:jdorn/json-editor.git","clone_url":"https://github.com/jdorn/json-editor.git","svn_url":"https://github.com/jdorn/json-editor","homepage":"","size":3688,"stargazers_count":2606,"watchers_count":2606,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":490,"mirror_url":null,"open_issues_count":279,"forks":490,"open_issues":279,"watchers":2606,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/jdorn/json-editor/pulls/583"},"html":{"href":"https://github.com/jdorn/json-editor/pull/583"},"issue":{"href":"https://api.github.com/repos/jdorn/json-editor/issues/583"},"comments":{"href":"https://api.github.com/repos/jdorn/json-editor/issues/583/comments"},"review_comments":{"href":"https://api.github.com/repos/jdorn/json-editor/pulls/583/comments"},"review_comment":{"href":"https://api.github.com/repos/jdorn/json-editor/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/jdorn/json-editor/pulls/583/commits"},"statuses":{"href":"https://api.github.com/repos/jdorn/json-editor/statuses/1961a4b1aef3fbeee98a1ed86953347fed05f0f9"}}}}