revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-26 16:52:41 +01:00
Code Issues Releases Wiki Activity

Provide "Undo" on Pholio mock edits

Browse source 
Summary: Ref T2637. Allows you to "undo" if you delete an image from a mock by accident.

Test Plan:
Deleted; undo'd.

{F50878}

Reviewers: btrahan, chad

Reviewed By: chad

CC: aran

Maniphest Tasks: T2637

Differential Revision: https://secure.phabricator.com/D6498
This commit is contained in:
epriestley 2013-07-19 08:50:49 -07:00
parent 02e1dc7443
commit 74ded4c1c5
4 changed files with 57 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/__celerity_resource_map__.php
View file

@ -2234,7 +2234,7 @@ celerity_register_resource_map(array(
), ),
'javelin-behavior-pholio-mock-edit' => 'javelin-behavior-pholio-mock-edit' =>
array( array(
'uri' => '/res/34a066b1/rsrc/js/application/pholio/behavior-pholio-mock-edit.js', 'uri' => '/res/ad171300/rsrc/js/application/pholio/behavior-pholio-mock-edit.js',
'type' => 'js', 'type' => 'js',
'requires' => 'requires' =>
array( array(
@ -3744,7 +3744,7 @@ celerity_register_resource_map(array(
), ),
'pholio-edit-css' => 'pholio-edit-css' =>
array( array(
'uri' => '/res/56034479/rsrc/css/application/pholio/pholio-edit.css', 'uri' => '/res/89db9291/rsrc/css/application/pholio/pholio-edit.css',
'type' => 'css', 'type' => 'css',
'requires' => 'requires' =>
array( array(

2
src/applications/pholio/controller/PholioMockEditController.php
View file

@ -233,6 +233,8 @@ final class PholioMockEditController extends PholioController {
'pht' => array( 'pht' => array(
'uploading' => pht('Uploading Image...'), 'uploading' => pht('Uploading Image...'),
'uploaded' => pht('Upload Complete...'), 'uploaded' => pht('Upload Complete...'),
'undo' => pht('Undo'),
'removed' => pht('This image will be removed from the mock.'),
), ),
)); ));

14
webroot/rsrc/css/application/pholio/pholio-edit.css
View file

@ -104,4 +104,18 @@
border: 1px solid #bbbbbb; border: 1px solid #bbbbbb;
background: #fcfcfc; background: #fcfcfc;
color: #666666; color: #666666;
margin-bottom: 12px;
}
.pholio-drop-undo {
padding: 8px;
margin-bottom: 12px;
text-align: center;
color: #333333;
border: 1px solid {$yellow};
background-color: {$lightyellow};
}
.pholio-drop-undo a {
font-weight: bold;
} }

46
webroot/rsrc/js/application/pholio/behavior-pholio-mock-edit.js
View file

@ -29,10 +29,7 @@ JX.behavior('pholio-mock-edit', function(config) {
}); });
drop.listen('willUpload', function(file) { drop.listen('willUpload', function(file) {
var node = JX.$N( var node = render_uploading();
'div',
{className: 'pholio-drop-uploading'},
pht('uploading'));
uploading.push({node: node, file: file}); uploading.push({node: node, file: file});
nodes.list.appendChild(node); nodes.list.appendChild(node);
}); });
@ -61,11 +58,46 @@ JX.behavior('pholio-mock-edit', function(config) {
/* -( Deleting Images )---------------------------------------------------- */ /* -( Deleting Images )---------------------------------------------------- */
// TODO: It would be nice to replace this with an "image will be removed,
// click to undo" kind of thing. // When the user clicks the "X" on an image, we replace it with a "click to
// undo" element. If they click to undo, we put the original node back in the
// DOM.
JX.Stratcom.listen('click', 'pholio-drop-remove', function(e) { JX.Stratcom.listen('click', 'pholio-drop-remove', function(e) {
e.kill(); e.kill();
JX.DOM.remove(e.getNode('pholio-drop-image'));
var node = e.getNode('pholio-drop-image');
var undo = render_undo();
JX.DOM.listen(undo, 'click', 'pholio-drop-undo', function(e) {
e.kill();
JX.DOM.replace(undo, node);
}); });
JX.DOM.replace(node, undo);
});
/* -( Rendering )---------------------------------------------------------- */
var render_uploading = function() {
return JX.$N(
'div',
{className: 'pholio-drop-uploading'},
pht('uploading'));
};
var render_undo = function() {
var link = JX.$N(
'a',
{href: '#', sigil: 'pholio-drop-undo'},
pht('undo'));
return JX.$N(
'div',
{className: 'pholio-drop-undo'},
[pht('removed'), ' ', link]);
};
}); });