Skip to content
This repository has been archived by the owner on Nov 20, 2018. It is now read-only.

Issue #484 #523

Closed
wants to merge 1 commit into from
Closed

Issue #484 #523

wants to merge 1 commit into from

Conversation

KJLJon
Copy link
Contributor

@KJLJon KJLJon commented Dec 8, 2012

Issue #484
I know it says it has been put on hold (but this adds support to the php file to customize the inputName)

So if you use
inputName in the javascript options
you will have to set the $inputName (see commented example on line 12)

<a href="https://github.com/valums/file-uploader/issues/484">#484</a>
I know it says it has been put on hold (but this adds support to the php file to customize the inputName)

So if you use
inputName in the javascript options
you will have to set the $inputName (see commented example on line 12)
@rnicholus
Copy link
Member

Has this been tested with 3.0 using both IE9 (or earlier) and non-IE browsers?

@KJLJon
Copy link
Contributor Author

KJLJon commented Dec 10, 2012

it's only server-side code.

It allows for the GET request attribute name to be something different then 'qqfile' (with the default set to 'qqfile').

reference: line 15

(humm, and I just realized github thinks I changed the whole file, when i actually only edited like 5 lines)
Do you know any efficient ways of making the diff only show the lines I changed (then I can also resubmit it to look cleaner)

is the master 3.0 or should I switch to the branch 3.1 to test it?

I tested the code on IE v9 and Chrome v23 (from a fresh download of the master branch)

let me know if I should test it using the 3.1 branch

@rnicholus
Copy link
Member

@KJLJon Looks like this is no longer a trivial merge, after I merged your PR in issue #526. Can you fix the merge conflicts and commit the changes?

KJLJon referenced this pull request in KJLJon/file-uploader Dec 13, 2012
I had a hard time to get github to merge the file (probably because I am not too familiar with merging branches, and my powershell keeps on erroring on me).

But this is merging the current php file with <a href="https://github.com/valums/file-uploader/pull/522">#522</a> and <a href="https://github.com/valums/file-uploader/pull/523">#523</a>
@KJLJon KJLJon closed this Dec 13, 2012
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants