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

Always redirect to My Files after upload

Browse source 
Summary:
I've found it quite confusing that uploading a single image displays the image itself but uploading more images displays My Files.
I've also got a user report about it because most users don't know that they can drop the image directly to the comment textarea and they are interested mainly in the ID of the uploaded file.

Test Plan: Upload a file.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, epriestley

Differential Revision: https://secure.phabricator.com/D1891
This commit is contained in:
vrana 2012-03-13 23:06:34 -07:00
parent efd6e087dc
commit 0553b32b37
2 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/__celerity_resource_map__.php
View file

@ -662,7 +662,7 @@ celerity_register_resource_map(array(
), ),
'javelin-behavior-files-drag-and-drop' => 'javelin-behavior-files-drag-and-drop' =>
array( array(
'uri' => '/res/0e84cc42/rsrc/js/application/core/behavior-files-drag-and-drop.js', 'uri' => '/res/3a7a2a8a/rsrc/js/application/core/behavior-files-drag-and-drop.js',
'type' => 'js', 'type' => 'js',
'requires' => 'requires' =>
array( array(
@ -1146,6 +1146,17 @@ celerity_register_resource_map(array(
), ),
'disk' => '/rsrc/js/javelin/lib/Resource.js', 'disk' => '/rsrc/js/javelin/lib/Resource.js',
), ),
0 =>
array(
'uri' => '/res/b6096fdd/rsrc/js/javelin/lib/__tests__/URI.js',
'type' => 'js',
'requires' =>
array(
0 => 'javelin-uri',
1 => 'javelin-php-serializer',
),
'disk' => '/rsrc/js/javelin/lib/__tests__/URI.js',
),
'javelin-stratcom' => 'javelin-stratcom' =>
array( array(
'uri' => '/res/3afdac66/rsrc/js/javelin/core/Stratcom.js', 'uri' => '/res/3afdac66/rsrc/js/javelin/core/Stratcom.js',

19
webroot/rsrc/js/application/core/behavior-files-drag-and-drop.js
View file

@ -35,20 +35,15 @@ JX.behavior('files-drag-and-drop', function(config) {
pending--; pending--;
if (pending == 0) { if (pending == 0) {
// If whatever the user dropped in has finished uploading, either send // If whatever the user dropped in has finished uploading, send them to
// them to the file itself (if they uploaded only one) or to their // their uploads.
// uploads (if they uploaded several).
var uri; var uri;
if (files.length == 1) { uri = JX.$U(config.browseURI);
uri = JX.$U(files[0].uri); var ids = [];
} else { for (var ii = 0; ii < files.length; ii++) {
uri = JX.$U(config.browseURI); ids.push(files[ii].id);
var ids = [];
for (var ii = 0; ii < files.length; ii++) {
ids.push(files[ii].id);
}
uri.setQueryParam('h', ids.join('-'));
} }
uri.setQueryParam('h', ids.join('-'));
// Reset so if you hit 'back' into the bfcache the page is still in a // Reset so if you hit 'back' into the bfcache the page is still in a
// sensible state. // sensible state.