Page MenuHomePhabricator
Files F15385111

D19773.id47232.diff
No OneTemporary
Actions

D19773.id47232.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -422,7 +422,6 @@
'rsrc/js/application/repository/repository-crossreference.js' => '9a860428',
'rsrc/js/application/search/behavior-reorder-profile-menu-items.js' => 'e2e0a072',
'rsrc/js/application/search/behavior-reorder-queries.js' => 'e9581f08',
- 'rsrc/js/application/slowvote/behavior-slowvote-embed.js' => '887ad43f',
'rsrc/js/application/transactions/behavior-comment-actions.js' => '038bf27f',
'rsrc/js/application/transactions/behavior-reorder-configs.js' => 'd7a74243',
'rsrc/js/application/transactions/behavior-reorder-fields.js' => 'b59e1e96',
@@ -674,7 +673,6 @@
'javelin-behavior-select-content' => 'bf5374ef',
'javelin-behavior-select-on-click' => '4e3e79a6',
'javelin-behavior-setup-check-https' => '491416b3',
- 'javelin-behavior-slowvote-embed' => '887ad43f',
'javelin-behavior-stripe-payment-form' => 'a6b98425',
'javelin-behavior-test-payment-form' => 'fc91ab6c',
'javelin-behavior-time-typeahead' => '522431f7',
@@ -1550,12 +1548,6 @@
'phabricator-keyboard-shortcut',
'javelin-stratcom',
),
- '887ad43f' => array(
- 'javelin-behavior',
- 'javelin-request',
- 'javelin-stratcom',
- 'javelin-dom',
- ),
'8935deef' => array(
'javelin-install',
'javelin-dom',
diff --git a/src/applications/slowvote/controller/PhabricatorSlowvoteVoteController.php b/src/applications/slowvote/controller/PhabricatorSlowvoteVoteController.php
--- a/src/applications/slowvote/controller/PhabricatorSlowvoteVoteController.php
+++ b/src/applications/slowvote/controller/PhabricatorSlowvoteVoteController.php
@@ -25,44 +25,6 @@
$old_votes = mpull($viewer_choices, null, 'getOptionID');
- if ($request->isAjax()) {
- $vote = $request->getInt('vote');
- $votes = array_keys($old_votes);
- $votes = array_fuse($votes);
-
- if ($poll->getMethod() == PhabricatorSlowvotePoll::METHOD_PLURALITY) {
- if (idx($votes, $vote, false)) {
- $votes = array();
- } else {
- $votes = array($vote);
- }
- } else {
- if (idx($votes, $vote, false)) {
- unset($votes[$vote]);
- } else {
- $votes[$vote] = $vote;
- }
- }
-
- $this->updateVotes($viewer, $poll, $old_votes, $votes);
-
- $updated_choices = id(new PhabricatorSlowvoteChoice())->loadAllWhere(
- 'pollID = %d AND authorPHID = %s',
- $poll->getID(),
- $viewer->getPHID());
-
- $embed = id(new SlowvoteEmbedView())
- ->setPoll($poll)
- ->setOptions($options)
- ->setViewerChoices($updated_choices);
-
- return id(new AphrontAjaxResponse())
- ->setContent(array(
- 'pollID' => $poll->getID(),
- 'contentHTML' => $embed->render(),
- ));
- }
-
if (!$request->isFormPost()) {
return id(new Aphront404Response());
}
diff --git a/src/applications/slowvote/view/SlowvoteEmbedView.php b/src/applications/slowvote/view/SlowvoteEmbedView.php
--- a/src/applications/slowvote/view/SlowvoteEmbedView.php
+++ b/src/applications/slowvote/view/SlowvoteEmbedView.php
@@ -39,12 +39,6 @@
}
require_celerity_resource('phabricator-slowvote-css');
- require_celerity_resource('javelin-behavior-slowvote-embed');
-
- $config = array(
- 'pollID' => $poll->getID(),
- );
- Javelin::initBehavior('slowvote-embed', $config);
$user_choices = $poll->getViewerChoices($this->getUser());
$user_choices = mpull($user_choices, 'getOptionID', 'getOptionID');
diff --git a/webroot/rsrc/js/application/slowvote/behavior-slowvote-embed.js b/webroot/rsrc/js/application/slowvote/behavior-slowvote-embed.js
deleted file mode 100644
--- a/webroot/rsrc/js/application/slowvote/behavior-slowvote-embed.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * @provides javelin-behavior-slowvote-embed
- * @requires javelin-behavior
- * javelin-request
- * javelin-stratcom
- * javelin-dom
- */
-JX.behavior('slowvote-embed', function() {
- JX.Stratcom.listen(
- ['click'],
- 'slowvote-option',
- function(e) {
- if (!e.isNormalMouseEvent()) {
- return;
- }
- e.kill();
-
- var pollID = e.getNodeData('slowvote-embed').pollID;
- var voteURI = '/vote/' + pollID + '/';
-
- var request = new JX.Request(voteURI, function(r) {
- var updated_poll = JX.$H(r.contentHTML);
- var root = JX.$('phabricator-standard-page');
-
- var polls = JX.DOM.scry(root, 'div', 'slowvote-embed');
-
- for(var i = 0; i < polls.length; i++) {
- var data = JX.Stratcom.getData(polls[i]);
-
- if (data.pollID == pollID) {
- JX.DOM.replace(polls[i], updated_poll);
- }
-
- }
-
- });
-
- request.addData({vote: e.getNodeData('slowvote-option').optionID});
- request.send();
-
- });
-
-});

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 15, 9:44 PM (2 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7600430
Default Alt Text
D19773.id47232.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility