when I switched scribd previews from using
the flash viewer to html5 I forgot to clean up
references to scribd.view.js
Change-Id: Iee01271699afa29e728b6fd87f7f388326223e02
Reviewed-on: https://gerrit.instructure.com/14560
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cameron Matheson <cameron@instructure.com>
fixes#11259
we removed sortable functionality in full files, but one stray .sortable() call
slipped in.
test plan:
- go to a course files page as a student
- you should not see a javascript error
Change-Id: Ibd0e038c04194e90cf8d14f78887279ab7190572
Reviewed-on: https://gerrit.instructure.com/14393
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
Tested-by: Bryan Madsen <bryan@instructure.com>
fixes#11239
Test Case:
Go to the files part of a course or your general files account.
1. Create a folder named "amazing"
2. Create another folder named "Dog"
3. amazing should be before Dog
4. Do steps 1 - 3 except create files with those names.
Change-Id: Id816bbc98b92e9294fdb5a82296746289174eadc
Reviewed-on: https://gerrit.instructure.com/14373
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Bryan Madsen <bryan@instructure.com>
files tree wasn't loading properly in IE8 because full_files.js was
using [].indexOf, which isn't supported in IE until version 9.
test plan:
* using IE8, open course or personal files page;
* verify that folders and files appear as expected and that the
page properly functions.
Change-Id: I60f4a62205d36cf08786004c5dcdfeda55f9f5b9
Reviewed-on: https://gerrit.instructure.com/14332
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Sterling Cobb <sterling@instructure.com>
Test plan:
preview a media object in course or user files and make sure it plays
Change-Id: I44f0ae788f4b02cb5399945336ff0656fa428f56
Reviewed-on: https://gerrit.instructure.com/14076
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Tested-by: Bryan Madsen <bryan@instructure.com>
fixes#10036
This commit removes the ability to sort files and folders by
dragging and replaces it with a default of alphabetizing every
item.
Test plan:
*Folder
1. Go the to files page http://localhost:3000/dashboard/files
2. Create a folder named "d_folder" then add a folder named "a_folder"
3. Ensure "a_folder" is before "d_folder"
*Files
1. Go the to files page http://localhost:3000/dashboard/files
2. Upload a file named "d_file.txt" then add a file named
"a_file.txt" (must have characters in the file"
3. Ensure "a_file.txt" is before "d_file.txt"
Change-Id: I3776ff996e338f8aa6fc3858b59e1460b8b1cdf0
Reviewed-on: https://gerrit.instructure.com/13554
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
closes#10956
Test plan:
* make a crocodocable homework submission
* preview the file in the user file's page and make sure it opens in
crocodoc (not google docs)
Change-Id: Ifa9557dbfba2f1253fa02b99ece20de7a7f9cd21
Reviewed-on: https://gerrit.instructure.com/14006
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
fixes#8221
test plan: no user visible changes in behavior, so this is a regression
test. repeat this test plan once for s3 files and once for local
files:
* verify file uploads on /courses/X/files and /dashboard/files
* upload to other folders
* upload multiple files
* zip uploads
* weird characters in filenames, duplicate filenames
* verify other places we upload files like content imports and sis
imports
Change-Id: I01b7805eb947097b250bf9be944a9347ecc4ff5e
aka: no more .dialog('close').dialog({}).dialog('open')
(does not actually change any behavior visible to end user)
test plan:
as far as manual testing goes, try to go to a bunch of pages that have dialogs
and open and close them.
For engineers, if you can think of other places where we might try to set options
on a UI widget before we initialize one (like sortables or something), check that too.
Change-Id: I7415c00d8c15b562ac12eeef83fa041aff1dfb35
Reviewed-on: https://gerrit.instructure.com/12810
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
- can open the dialog multiple times without
getting into a strange state
- can save files from the editor
Change-Id: I8dd0eea66a61e3fcfb5e215714493c2bab1e1f8b
Reviewed-on: https://gerrit.instructure.com/12766
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
For some reason, uploadify on Chrome Windows as of version 21 appears to be
calling the uploadify error callback when the upload request actually
succeeded. This might be a bug in uploadify, but the upgrade to a more recent
uploadify is still a work in progress.
This intercepts the success in the failure callback and kicks off what would
normally happen on success.
fixes#9766
test plan:
* Install Windows and Chrome v21
* Enable S3
* Upload a file in the Files section using "Add File" link
* The upload should succeed
Change-Id: If254182dfc35c8a67deff8be5e7ebeff1c18ada3
Reviewed-on: https://gerrit.instructure.com/12744
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
test plan:
1. Go to a course files page
2. Upload an html file
3. click edit content
4. note the tinymce editor
5. toggle back and forth between views
6. save changes
7. make sure it changed
Change-Id: I4950b87728c728008ee548bc41d09513b80caed6
Reviewed-on: https://gerrit.instructure.com/12557
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
adds (root) account-level setting for (default) user file quotas. defaults
to 50 MB.
test plan:
1. on a root account, change the default user quota to something other
than 50 MB (e.g. 1 MB)
2. as a user in that account:
1. go to /users/self/files/quota . you should see the new quota
2. attempt to upload files. once you have hit/exceeded the quota, you
should not be able to upload additional files
3. as a user in multiple (root) accounts:
1. go to /users/self/files/quota . your quota should be the sum of the
root account user quotas
2. attempt to upload files. once you have hit/exceeded the quota, you
should not be able to upload additional files
note that the previous behavior does not change in that one file can exceed
your quota. e.g. if your quota is 1 MB, you can upload a 2 MB file. only
then will you be prevented from uploading additional files
Change-Id: If7f5903fb54eb2b62d80a2b4ee8adfcc48a63683
Reviewed-on: https://gerrit.instructure.com/12005
Reviewed-by: Joe Tanner <joe@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
when you require ['jquery'] you are now getting the
version of jquery that has our patches applied to it
you should not need to think about the patching as
you write code.
this also applies to jqueryui/dialog, that will return
the patched version of it.
test plan:
make sure javascript still works on our site ;)
Change-Id: I237fa8da5f93167140c4d42b80eb3ef17d95c1e6
Reviewed-on: https://gerrit.instructure.com/9878
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
test plan:
* in files page, add a folder and a file with really
a really long name, use big words with no spaces,
so they can't just wrap on whitespace.
* make sure a tooltip pops up when you hover over them
in the left side.
Change-Id: I201c2da8c263d9cf511055dac5d2c5d786ce11ce
Reviewed-on: https://gerrit.instructure.com/9606
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
also fix/enable zip file uploads in group and user contexts -- they were
partially enabled, but broken. This required generalizing
UnzipAttachment to work for any context, not just courses, though that
was mostly just a matter of renaming things.
The zip file uploads in accounts are still not enabled, as the accounts
file section is not implemented yet, though it's referenced in the
routes file.
fixes#5913fixes#5728fixes#5463fixes#5012
test plan:
* upload a zip file to a course, to a group, and to a user's files. in
each case, try uploading the zip both through the button in the file
browser, and by dragging a zip file into the file browser (in a
capable web browser)
Change-Id: I6c648ef677d2bd61ae41a2b8fe0f89be43d63375
Reviewed-on: https://gerrit.instructure.com/7402
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
on course files page, 'add files' link wasn't underlining on
highlight because the swf overlaying it was stealing its mouseover
event.
test plan:
* visit the files page for a course;
* mouseover the 'add files' link;
* verify that it properly underlines;
* mouseout of the link and verify that the underline disappears.
Change-Id: I065bf099b290bdf20c3c580e0e272ff643c562c1
Reviewed-on: https://gerrit.instructure.com/8934
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cameron Matheson <cameron@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
"Trivial" JavaScript / CoffeeScript changes
--------------------------------------------------
For the most part, all javascript was simply
wrapped in `require` or `define`. The dependencies
were found with a script that matched regexes in
the files, it errs on the side of listing too many
dependencies, so its worth double checking each
file's dependencies (over time, anyway).
i18n API changes
--------------------------------------------------
No longer have to do I18n.scoped calls, just
list i18n as a dependency with the scope and it's
imported already scoped
require ['i18n!some_scope'], (I18n) ->
I18n.t 'im_scoped', 'I'm scoped!'
JS bundling now done with r.js, not Jammit
--------------------------------------------------
We don't use jammit to bundle JS anymore. Simply
list dependencies for your JS modules in the file
and RequireJS handles the rest.
To optimize the JavaScript, first make sure you
have node.js 0.4.12+ installed and then run:
$ rake js:build
The app defaults to the optimized build in
production. You can use non-optimized in
production by putting ?debug_assets=true in the
url just like before.
You can also test the optimized JavaScript in
development with ?optimized_js=true.
Significant changes
--------------------------------------------------
These files have "real" changes to them (unlike
the JavaScript that is simply wrapped in require
and define). Worth taking a really close look at:
- app/helpers/application_helper.rb
- app/views/layouts/application.html.erb
- config/assets.yml
- config/build.js
- lib/handlebars/handlebars.rb
- lib/i18n_extraction/js_extractor.rb
- lib/tasks/canvas.rake
- lib/tasks/i18n.rake
- lib/tasks/js.rake
Change-Id: I4bc5ecb1231f331aaded0fef2bcc1f3a9fe482a7
Reviewed-on: https://gerrit.instructure.com/6986
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
A user who doesn't have permission to create a collaboration was
shown a paragraph that tells them to click a "new collaboration"
link. They won't see that anymore
Test Plan:
* Create a student group in a course
* As the teacher (who isn't a member of the group) go to the files page of the group
* Click the collaborations link.
* There shouldn't be a second paragraph saying to click "New Collaboration"
closes#6228
Change-Id: I96d6f68cbd5871b11abcf87a6472af58b66f711e
Reviewed-on: https://gerrit.instructure.com/7197
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Now that we're adding the prefix to our JSON responses, we need to be
sure to go through our modified jquery json parser function.
testplan:
* make sure that conversations paging now works again
* check other actions that use pageless, like user page views
this fixes some existing selenium specs, like in conversations.
refs #6459
Change-Id: I2652fc7a7acef099fe163a63e6b3933ddb2e9360
Reviewed-on: https://gerrit.instructure.com/7188
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
Test case:
1. Go to the files on a course or dashboard or
wherever
2. add a new folder
3. add another folder or file
4. drag a folder or file into one of the new
folders on the left panel
Change-Id: Id0d4b1a857603f33056a78f79ad79cbf2e75cca8
Reviewed-on: https://gerrit.instructure.com/6788
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
this makes scoped block detection a bit more strict now, so several
js files need their indentation fixed
test plan: confirm that i18n:extract works and that the result is the
same
Change-Id: If23768dfd3626b46d798560bb3b843595295444b
Reviewed-on: https://gerrit.instructure.com/6736
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
there were two problems.
first, the jquery .bind() method supported the (type, listener,
useCapture) signature from addEventListener in older jQuery, but it was
undocumented. newer jQuery breaks that signature. take out the false
value intended for (but not used as) useCapture (that was the default
anyways) and it works.
second, the values for the keys in the params object for
$.toMultipartForm aren't always defined. for example, in
uploadAjaxFiles, the queued ajax upload doesn't always have the
duplicate_handling property set and so the params would include
'duplicate_handling': undefined. don't blow up in that case.
fixes#5663
Change-Id: Ib014eca887c5f3f935cc1d521e2184593d7e1bb8
Reviewed-on: https://gerrit.instructure.com/6273
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Florence <ryanf@instructure.com>
added space to text createdso>created so
Change-Id: I21b91784efbe896fbe85a2826f205281c3766fa2
Reviewed-on: https://gerrit.instructure.com/5876
Reviewed-by: Jon Jensen <jon@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jon Jensen <jon@instructure.com>
Added a step to the flash upload process in the Files section to do a
preflight check to see if there are any duplicate filenames. If there are, the
user gets the option to either rename the new files, or overwrite the existing
ones. (Overwrite means deleting them - we already have code that will redirect
to new files with the same name as deleted files if they're linked directly by
id.)
Change-Id: I926631aadcebec3cae1607f818044f7cd4b74cea
Reviewed-on: https://gerrit.instructure.com/5091
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
slideUp and slideDown were being used "show" and "hide", but sometimes
they would get called multiple times in a row, making file upload errors
go away obnoxiously quickly and so forth.
with this abstraction, a displayed message will always get at least 3
seconds of user visibility before being hidden
Change-Id: Id3c5749a1778bec2896fa0399df731c6967e4a2d
Reviewed-on: https://gerrit.instructure.com/4817
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
data.filename was not being populated, so the filename field
of the multipart request was empty, causing rack to just throw
it away. NOTE: rack throws away fields if you provide filename=""
with content-disposition file.
fixes#5154
Change-Id: If6f0a3a818aaa2f97ee4aded4bea80063209b12a
Reviewed-on: https://gerrit.instructure.com/4840
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
we were adding files to the queue, and then calling uploadNext with
that file specifically. when uploadNext got called again it would find
the same file in the queue and try again.
now just add it to the queue and then process the queue
refs #5143
Change-Id: I53476b3170169a9dc60a9e5edf69a119e2795fbd
Reviewed-on: https://gerrit.instructure.com/4818
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
fixed several key collisions and other minor issues
Change-Id: Ibe15c9963c26226d1d4676066b96b8a76bf50931
Reviewed-on: https://gerrit.instructure.com/4321
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
this makes it so devices without flash (eg: iThings) can
view documents inline.
Includes a few other changes:
* add UI to account/settings page to enable/disable 3rd
party services (i.e. google docs previews, twitter, linkedIn)
-- you can disable these previews there.
* use DRYer API for embedding scribd docs this also makes
them ready if/when we switch to ssl
* open documents on show_preview page in a modal window
instead of inline in the list (which would grow a
little wider every time you mouse over it) fixes#4004
* use all available screen real-estate on files#show page
(before it would only use 400px of height).
fixes#4007
Change-Id: I0bb4b10c75c2217f35e0361bef61ca0b602533a9
Reviewed-on: https://gerrit.instructure.com/2662
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
The xhr request was sending an empty body, which was
failing in rack before ever even getting to rails.
fixes#4077
Change-Id: I894419a5d0700a6fc8adfa752203cc2689481337
Reviewed-on: https://gerrit.instructure.com/2904
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Bryan Madsen