{"action":"created","comment":{"url":"https://api.github.com/repos/oppia/oppia/pulls/comments/48107004","id":48107004,"diff_hunk":"@@ -49,22 +49,38 @@ oppia.directive('oppiaInteractiveLogicProof', [\n         );\n         $scope.questionData.language.operators = $scope.typing[0].operators;\n \n-        $scope.assumptionsString = logicProofShared.displayExpressionArray(\n-          $scope.questionData.assumptions,\n-          $scope.questionData.language.operators);\n-        $scope.targetString = logicProofShared.displayExpression(\n-          $scope.questionData.results[0],\n-          $scope.questionData.language.operators);\n+        $scope.displayExpression = function(exp) {\n+          return logicProofShared.displayExpression(\n+            exp, $scope.questionData.language.operators);\n+        };\n+\n+        $scope.displayExpressionArray = function(arr) {\n+          return logicProofShared.displayExpressionArray(\n+            arr, $scope.questionData.language.operators);\n+        };\n+\n+        if ($scope.questionData.assumptions.length <= 1) {\n+          $scope.assumptionsString = $scope.displayExpressionArray(\n+            $scope.questionData.assumptions);\n+        } else {\n+          $scope.assumptionsString = $scope.displayExpressionArray(\n+            $scope.questionData.assumptions.slice(\n+              0, $scope.questionData.assumptions.length - 1)\n+            ) + ' and ' + $scope.displayExpression(\n+              $scope.questionData.assumptions[\n+                $scope.questionData.assumptions.length - 1]);\n+        }\n+        $scope.targetString = $scope.displayExpression(\n+          $scope.questionData.results[0]);\n         $scope.questionString = ($scope.assumptionsString === '') ?\n             'Prove ' + $scope.targetString + '.':\n             'Assuming ' + (\n               $scope.assumptionsString + '; prove ' + $scope.targetString +\n               '.');\n \n-\n         $scope.questionInstance = logicProofStudent.buildInstance(\n           $scope.questionData);\n-        $scope.haveErrorMessage = false;\n+        $scope.messageIsSticky = false;","path":"extensions/interactions/LogicProof/LogicProof.js","position":54,"original_position":54,"commit_id":"30a5dc87ee0dc6ee2b414886623662e05b64da8d","original_commit_id":"30a5dc87ee0dc6ee2b414886623662e05b64da8d","user":{"login":"jacobdavis11","id":13726796,"avatar_url":"https://avatars.githubusercontent.com/u/13726796?v=3","gravatar_id":"","url":"https://api.github.com/users/jacobdavis11","html_url":"https://github.com/jacobdavis11","followers_url":"https://api.github.com/users/jacobdavis11/followers","following_url":"https://api.github.com/users/jacobdavis11/following{/other_user}","gists_url":"https://api.github.com/users/jacobdavis11/gists{/gist_id}","starred_url":"https://api.github.com/users/jacobdavis11/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jacobdavis11/subscriptions","organizations_url":"https://api.github.com/users/jacobdavis11/orgs","repos_url":"https://api.github.com/users/jacobdavis11/repos","events_url":"https://api.github.com/users/jacobdavis11/events{/privacy}","received_events_url":"https://api.github.com/users/jacobdavis11/received_events","type":"User","site_admin":false},"body":"Done.","created_at":"2015-12-20T19:15:04Z","updated_at":"2015-12-20T19:15:04Z","html_url":"https://github.com/oppia/oppia/pull/1267#discussion_r48107004","pull_request_url":"https://api.github.com/repos/oppia/oppia/pulls/1267","_links":{"self":{"href":"https://api.github.com/repos/oppia/oppia/pulls/comments/48107004"},"html":{"href":"https://github.com/oppia/oppia/pull/1267#discussion_r48107004"},"pull_request":{"href":"https://api.github.com/repos/oppia/oppia/pulls/1267"}}},"pull_request":{"url":"https://api.github.com/repos/oppia/oppia/pulls/1267","id":54188508,"html_url":"https://github.com/oppia/oppia/pull/1267","diff_url":"https://github.com/oppia/oppia/pull/1267.diff","patch_url":"https://github.com/oppia/oppia/pull/1267.patch","issue_url":"https://api.github.com/repos/oppia/oppia/issues/1267","number":1267,"state":"open","locked":false,"title":"LogicProof extension: Adjust to match the new learner view style. Also imp…","user":{"login":"jacobdavis11","id":13726796,"avatar_url":"https://avatars.githubusercontent.com/u/13726796?v=3","gravatar_id":"","url":"https://api.github.com/users/jacobdavis11","html_url":"https://github.com/jacobdavis11","followers_url":"https://api.github.com/users/jacobdavis11/followers","following_url":"https://api.github.com/users/jacobdavis11/following{/other_user}","gists_url":"https://api.github.com/users/jacobdavis11/gists{/gist_id}","starred_url":"https://api.github.com/users/jacobdavis11/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jacobdavis11/subscriptions","organizations_url":"https://api.github.com/users/jacobdavis11/orgs","repos_url":"https://api.github.com/users/jacobdavis11/repos","events_url":"https://api.github.com/users/jacobdavis11/events{/privacy}","received_events_url":"https://api.github.com/users/jacobdavis11/received_events","type":"User","site_admin":false},"body":"…rove handling of tabs, blank lines and question display.","created_at":"2015-12-19T23:01:17Z","updated_at":"2015-12-20T19:15:04Z","closed_at":null,"merged_at":null,"merge_commit_sha":"6a0ea447fad34116ea621f8744d9d210acc6bdab","assignee":{"login":"seanlip","id":10575562,"avatar_url":"https://avatars.githubusercontent.com/u/10575562?v=3","gravatar_id":"","url":"https://api.github.com/users/seanlip","html_url":"https://github.com/seanlip","followers_url":"https://api.github.com/users/seanlip/followers","following_url":"https://api.github.com/users/seanlip/following{/other_user}","gists_url":"https://api.github.com/users/seanlip/gists{/gist_id}","starred_url":"https://api.github.com/users/seanlip/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/seanlip/subscriptions","organizations_url":"https://api.github.com/users/seanlip/orgs","repos_url":"https://api.github.com/users/seanlip/repos","events_url":"https://api.github.com/users/seanlip/events{/privacy}","received_events_url":"https://api.github.com/users/seanlip/received_events","type":"User","site_admin":false},"milestone":null,"commits_url":"https://api.github.com/repos/oppia/oppia/pulls/1267/commits","review_comments_url":"https://api.github.com/repos/oppia/oppia/pulls/1267/comments","review_comment_url":"https://api.github.com/repos/oppia/oppia/pulls/comments{/number}","comments_url":"https://api.github.com/repos/oppia/oppia/issues/1267/comments","statuses_url":"https://api.github.com/repos/oppia/oppia/statuses/30a5dc87ee0dc6ee2b414886623662e05b64da8d","head":{"label":"oppia:logic-proof-fixes","ref":"logic-proof-fixes","sha":"30a5dc87ee0dc6ee2b414886623662e05b64da8d","user":{"login":"oppia","id":11620230,"avatar_url":"https://avatars.githubusercontent.com/u/11620230?v=3","gravatar_id":"","url":"https://api.github.com/users/oppia","html_url":"https://github.com/oppia","followers_url":"https://api.github.com/users/oppia/followers","following_url":"https://api.github.com/users/oppia/following{/other_user}","gists_url":"https://api.github.com/users/oppia/gists{/gist_id}","starred_url":"https://api.github.com/users/oppia/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/oppia/subscriptions","organizations_url":"https://api.github.com/users/oppia/orgs","repos_url":"https://api.github.com/users/oppia/repos","events_url":"https://api.github.com/users/oppia/events{/privacy}","received_events_url":"https://api.github.com/users/oppia/received_events","type":"Organization","site_admin":false},"repo":{"id":40687563,"name":"oppia","full_name":"oppia/oppia","owner":{"login":"oppia","id":11620230,"avatar_url":"https://avatars.githubusercontent.com/u/11620230?v=3","gravatar_id":"","url":"https://api.github.com/users/oppia","html_url":"https://github.com/oppia","followers_url":"https://api.github.com/users/oppia/followers","following_url":"https://api.github.com/users/oppia/following{/other_user}","gists_url":"https://api.github.com/users/oppia/gists{/gist_id}","starred_url":"https://api.github.com/users/oppia/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/oppia/subscriptions","organizations_url":"https://api.github.com/users/oppia/orgs","repos_url":"https://api.github.com/users/oppia/repos","events_url":"https://api.github.com/users/oppia/events{/privacy}","received_events_url":"https://api.github.com/users/oppia/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/oppia/oppia","description":"Tool for collaboratively building interactive tutors.","fork":false,"url":"https://api.github.com/repos/oppia/oppia","forks_url":"https://api.github.com/repos/oppia/oppia/forks","keys_url":"https://api.github.com/repos/oppia/oppia/keys{/key_id}","collaborators_url":"https://api.github.com/repos/oppia/oppia/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/oppia/oppia/teams","hooks_url":"https://api.github.com/repos/oppia/oppia/hooks","issue_events_url":"https://api.github.com/repos/oppia/oppia/issues/events{/number}","events_url":"https://api.github.com/repos/oppia/oppia/events","assignees_url":"https://api.github.com/repos/oppia/oppia/assignees{/user}","branches_url":"https://api.github.com/repos/oppia/oppia/branches{/branch}","tags_url":"https://api.github.com/repos/oppia/oppia/tags","blobs_url":"https://api.github.com/repos/oppia/oppia/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/oppia/oppia/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/oppia/oppia/git/refs{/sha}","trees_url":"https://api.github.com/repos/oppia/oppia/git/trees{/sha}","statuses_url":"https://api.github.com/repos/oppia/oppia/statuses/{sha}","languages_url":"https://api.github.com/repos/oppia/oppia/languages","stargazers_url":"https://api.github.com/repos/oppia/oppia/stargazers","contributors_url":"https://api.github.com/repos/oppia/oppia/contributors","subscribers_url":"https://api.github.com/repos/oppia/oppia/subscribers","subscription_url":"https://api.github.com/repos/oppia/oppia/subscription","commits_url":"https://api.github.com/repos/oppia/oppia/commits{/sha}","git_commits_url":"https://api.github.com/repos/oppia/oppia/git/commits{/sha}","comments_url":"https://api.github.com/repos/oppia/oppia/comments{/number}","issue_comment_url":"https://api.github.com/repos/oppia/oppia/issues/comments{/number}","contents_url":"https://api.github.com/repos/oppia/oppia/contents/{+path}","compare_url":"https://api.github.com/repos/oppia/oppia/compare/{base}...{head}","merges_url":"https://api.github.com/repos/oppia/oppia/merges","archive_url":"https://api.github.com/repos/oppia/oppia/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/oppia/oppia/downloads","issues_url":"https://api.github.com/repos/oppia/oppia/issues{/number}","pulls_url":"https://api.github.com/repos/oppia/oppia/pulls{/number}","milestones_url":"https://api.github.com/repos/oppia/oppia/milestones{/number}","notifications_url":"https://api.github.com/repos/oppia/oppia/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/oppia/oppia/labels{/name}","releases_url":"https://api.github.com/repos/oppia/oppia/releases{/id}","created_at":"2015-08-14T00:16:14Z","updated_at":"2015-12-17T03:15:21Z","pushed_at":"2015-12-20T01:45:37Z","git_url":"git://github.com/oppia/oppia.git","ssh_url":"git@github.com:oppia/oppia.git","clone_url":"https://github.com/oppia/oppia.git","svn_url":"https://github.com/oppia/oppia","homepage":"https://www.oppia.org","size":44544,"stargazers_count":65,"watchers_count":65,"language":"Python","has_issues":true,"has_downloads":false,"has_wiki":true,"has_pages":false,"forks_count":86,"mirror_url":null,"open_issues_count":238,"forks":86,"open_issues":238,"watchers":65,"default_branch":"develop"}},"base":{"label":"oppia:develop","ref":"develop","sha":"e18ce468f4cfa2e92ae96be75cea69f2d1688fba","user":{"login":"oppia","id":11620230,"avatar_url":"https://avatars.githubusercontent.com/u/11620230?v=3","gravatar_id":"","url":"https://api.github.com/users/oppia","html_url":"https://github.com/oppia","followers_url":"https://api.github.com/users/oppia/followers","following_url":"https://api.github.com/users/oppia/following{/other_user}","gists_url":"https://api.github.com/users/oppia/gists{/gist_id}","starred_url":"https://api.github.com/users/oppia/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/oppia/subscriptions","organizations_url":"https://api.github.com/users/oppia/orgs","repos_url":"https://api.github.com/users/oppia/repos","events_url":"https://api.github.com/users/oppia/events{/privacy}","received_events_url":"https://api.github.com/users/oppia/received_events","type":"Organization","site_admin":false},"repo":{"id":40687563,"name":"oppia","full_name":"oppia/oppia","owner":{"login":"oppia","id":11620230,"avatar_url":"https://avatars.githubusercontent.com/u/11620230?v=3","gravatar_id":"","url":"https://api.github.com/users/oppia","html_url":"https://github.com/oppia","followers_url":"https://api.github.com/users/oppia/followers","following_url":"https://api.github.com/users/oppia/following{/other_user}","gists_url":"https://api.github.com/users/oppia/gists{/gist_id}","starred_url":"https://api.github.com/users/oppia/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/oppia/subscriptions","organizations_url":"https://api.github.com/users/oppia/orgs","repos_url":"https://api.github.com/users/oppia/repos","events_url":"https://api.github.com/users/oppia/events{/privacy}","received_events_url":"https://api.github.com/users/oppia/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/oppia/oppia","description":"Tool for collaboratively building interactive tutors.","fork":false,"url":"https://api.github.com/repos/oppia/oppia","forks_url":"https://api.github.com/repos/oppia/oppia/forks","keys_url":"https://api.github.com/repos/oppia/oppia/keys{/key_id}","collaborators_url":"https://api.github.com/repos/oppia/oppia/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/oppia/oppia/teams","hooks_url":"https://api.github.com/repos/oppia/oppia/hooks","issue_events_url":"https://api.github.com/repos/oppia/oppia/issues/events{/number}","events_url":"https://api.github.com/repos/oppia/oppia/events","assignees_url":"https://api.github.com/repos/oppia/oppia/assignees{/user}","branches_url":"https://api.github.com/repos/oppia/oppia/branches{/branch}","tags_url":"https://api.github.com/repos/oppia/oppia/tags","blobs_url":"https://api.github.com/repos/oppia/oppia/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/oppia/oppia/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/oppia/oppia/git/refs{/sha}","trees_url":"https://api.github.com/repos/oppia/oppia/git/trees{/sha}","statuses_url":"https://api.github.com/repos/oppia/oppia/statuses/{sha}","languages_url":"https://api.github.com/repos/oppia/oppia/languages","stargazers_url":"https://api.github.com/repos/oppia/oppia/stargazers","contributors_url":"https://api.github.com/repos/oppia/oppia/contributors","subscribers_url":"https://api.github.com/repos/oppia/oppia/subscribers","subscription_url":"https://api.github.com/repos/oppia/oppia/subscription","commits_url":"https://api.github.com/repos/oppia/oppia/commits{/sha}","git_commits_url":"https://api.github.com/repos/oppia/oppia/git/commits{/sha}","comments_url":"https://api.github.com/repos/oppia/oppia/comments{/number}","issue_comment_url":"https://api.github.com/repos/oppia/oppia/issues/comments{/number}","contents_url":"https://api.github.com/repos/oppia/oppia/contents/{+path}","compare_url":"https://api.github.com/repos/oppia/oppia/compare/{base}...{head}","merges_url":"https://api.github.com/repos/oppia/oppia/merges","archive_url":"https://api.github.com/repos/oppia/oppia/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/oppia/oppia/downloads","issues_url":"https://api.github.com/repos/oppia/oppia/issues{/number}","pulls_url":"https://api.github.com/repos/oppia/oppia/pulls{/number}","milestones_url":"https://api.github.com/repos/oppia/oppia/milestones{/number}","notifications_url":"https://api.github.com/repos/oppia/oppia/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/oppia/oppia/labels{/name}","releases_url":"https://api.github.com/repos/oppia/oppia/releases{/id}","created_at":"2015-08-14T00:16:14Z","updated_at":"2015-12-17T03:15:21Z","pushed_at":"2015-12-20T01:45:37Z","git_url":"git://github.com/oppia/oppia.git","ssh_url":"git@github.com:oppia/oppia.git","clone_url":"https://github.com/oppia/oppia.git","svn_url":"https://github.com/oppia/oppia","homepage":"https://www.oppia.org","size":44544,"stargazers_count":65,"watchers_count":65,"language":"Python","has_issues":true,"has_downloads":false,"has_wiki":true,"has_pages":false,"forks_count":86,"mirror_url":null,"open_issues_count":238,"forks":86,"open_issues":238,"watchers":65,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/oppia/oppia/pulls/1267"},"html":{"href":"https://github.com/oppia/oppia/pull/1267"},"issue":{"href":"https://api.github.com/repos/oppia/oppia/issues/1267"},"comments":{"href":"https://api.github.com/repos/oppia/oppia/issues/1267/comments"},"review_comments":{"href":"https://api.github.com/repos/oppia/oppia/pulls/1267/comments"},"review_comment":{"href":"https://api.github.com/repos/oppia/oppia/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/oppia/oppia/pulls/1267/commits"},"statuses":{"href":"https://api.github.com/repos/oppia/oppia/statuses/30a5dc87ee0dc6ee2b414886623662e05b64da8d"}}}}