Commit Graph

146 Commits (173f28a09d4b88e91fe1c2db16f2aab9f171a627)

Author SHA1 Message Date
Vincent Petry 763d9ded1d Prevent showing the file picker twice
In case the filepicker function is called twice, only show it once.
2014-06-20 13:39:46 +07:00
kondou 9bc3f3cf30 Scrutinizer cleanup 2014-06-02 21:09:41 +07:00
Remco Brenninkmeijer 4f0370f1da Fix for #8654 2014-05-22 10:35:01 +07:00
Lukas Reschke 62364269c5 Fix Typo, define $ as global 2014-05-11 10:55:00 +07:00
Robin Appelman 163a7a47f9 Add prompt dialog to OC.dialogs 2014-05-09 17:09:06 +07:00
Thomas Müller 1fdd17b9b1 javascript code cleanup + fixing syntax errors 2014-04-14 19:29:00 +07:00
Morris Jobke d8f56e3c00 Merge pull request #8049 from owncloud/filepickersvg
Fix file picker SVG issues
2014-04-09 15:05:40 +07:00
Jörn Friedrich Dreyer 779dff31c4 translations for oc-dialogs reside in code 2014-04-07 11:58:32 +07:00
Jörn Friedrich Dreyer c90b0ac00b Fix copy conflict dialog translation 2014-04-07 11:46:47 +07:00
Vincent Petry d4f9cc567a Fix SVG close button of file picker 2014-04-04 11:52:15 +07:00
Vincent Petry 05a7bfed71 Fix file picker to correctly show SVG file icons 2014-04-04 11:44:11 +07:00
Vincent Petry 2b8bb01211 Fixed mime type attribute access in file overwrite dialog 2014-04-03 16:55:01 +07:00
Vincent Petry 0be9de5df5 Files, trashbin, public apps use ajax/JSON for the file list
Files app:

- removed file list template, now rendering list from JSON response
- FileList.addFile/addDir is now FileList.add() and takes a JS map with all required
  arguments instead of having a long number of function arguments
- added unit tests for many FileList operations
- fixed newfile.php, newfolder.php and rename.php to return the file's
  full JSON on success
- removed obsolete/unused undo code
- removed download_url / loading options, now using
  Files.getDownloadUrl() for that
- server side now uses Helper::getFileInfo() to prepare file JSON response
- previews are now client-side only

Breadcrumbs are now JS only:

- Added BreadCrumb class to handle breadcrumb rendering and events
- Added unit test for BreadCrumb class
- Moved all relevant JS functions to the BreadCrumb class

Public page now uses ajax to load the file list:

- Added Helper class in sharing app to make it easier to authenticate
  and retrieve the file's real path
- Added ajax/list.php to retrieve the file list
- Fixed FileActions and FileList to work with the ajax list

Core:

- Fixed file picker dialog to use the same list format as files app
2014-04-02 15:33:47 +07:00
Jörn Friedrich Dreyer d9e333c0da use directory from original instead of current dir 2014-02-21 14:01:38 +07:00
Vincent Petry e62ca4ea4f Append file etag to preview URLs
Fixes #5534
2013-10-28 14:14:55 +07:00
Vincent Petry e2a4417079 Fixed conflict dialog in IE8
- Fixed JS error that prevent the conflict dialog to open #5060
- Fixed JS error that prevented the overwrite case to run
2013-10-10 15:54:00 +07:00
Jörn Friedrich Dreyer 5a174eba83 use correct property for mimetype of existing files 2013-10-07 11:14:11 +07:00
Jörn Friedrich Dreyer 078bf0df25 use {count} instead of 'One' for more versatile translation 2013-09-19 12:05:30 +07:00
Jörn Friedrich Dreyer a6933efce3 use n to translate title 2013-09-19 11:25:41 +07:00
Jörn Friedrich Dreyer 0d81a53e12 use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe something is wrong there 2013-09-19 10:00:42 +07:00
Jörn Friedrich Dreyer f7800cd63e fix 'event is not defined' error 2013-09-19 09:47:51 +07:00
Jörn Friedrich Dreyer 72d53008cc indentation 2013-09-18 17:58:15 +07:00
Jörn Friedrich Dreyer 7bd5e89f8c simplify conflict template handling, fix reopen after ESC 2013-09-18 17:22:29 +07:00
Jörn Friedrich Dreyer b59ce403d8 Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
	apps/files/css/files.css
	apps/files/js/file-upload.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files_sharing/js/public.js
	core/js/jquery.ocdialog.js
	core/js/oc-dialogs.js
2013-09-17 19:10:46 +07:00
Thomas Müller db7e1dd877 Merge pull request #4853 from owncloud/external-shared_mimetype-icons
Use external and shared icons in OC.Dialogs.filepicker()
2013-09-15 02:42:14 +07:00
Thomas Tanghus dcc899d0a0 Merge pull request #4806 from owncloud/oc-dialogs-pageleave
Don't popup meaningless alerts when dialog called on page leave
2013-09-14 10:35:39 +07:00
kondou c117e719da Use external and shared icons in OC.Dialogs.filepicker() 2013-09-14 14:35:23 +07:00
Thomas Tanghus 08225a60c8 Save two lines 2013-09-11 21:15:32 +07:00
Thomas Tanghus 1f8f0e61d8 Remove test error :P 2013-09-11 21:11:35 +07:00
Thomas Tanghus 799c5c2c9b Don't popup meaningless alerts when dialog called on page leave 2013-09-11 16:02:12 +07:00
Jörn Friedrich Dreyer bd1d5b69fb fix ESC for conflicts dialog 2013-09-08 17:31:12 +07:00
Jörn Friedrich Dreyer 0a0410815e close and destroy dialog on ESC 2013-09-08 10:11:35 +07:00
Robin Appelman 00cc83e3f7 show preview for uploading image files on conflict 2013-09-07 14:58:51 +07:00
Jörn Friedrich Dreyer ce03501646 fine ie8 compatability 2013-09-06 23:44:40 +07:00
Jörn Friedrich Dreyer 673e0c01a7 fix page leaving checks 2013-09-06 22:40:10 +07:00
Jörn Friedrich Dreyer 02d14aee17 completely remove dialog on cancel/continue 2013-09-06 16:50:45 +07:00
kondou c6ca9c1e9d Use shorter array-conversion 2013-09-06 13:33:17 +07:00
kondou f84fe479a5 Only use mimetype_list and clean up a bit 2013-09-05 18:40:55 +07:00
Jörn Friedrich Dreyer 8a7e26b268 cleanup dead code 2013-09-05 17:46:19 +07:00
kondou 992b59f70b Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype 2013-09-05 16:54:12 +07:00
Jörn Friedrich Dreyer bbf8acb383 separate uploading code from progress code, add progress capability detection 2013-09-05 10:19:54 +07:00
Jörn Friedrich Dreyer 49fd7e9f1e refactor dialog creation 2013-09-04 16:42:18 +07:00
Jörn Friedrich Dreyer 4af5a8c483 Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/file-upload.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files/templates/part.list.php
2013-09-04 14:11:40 +07:00
kondou d62c5063f4 Add previews to OC.dialogs.filepicker(); Fix #4697 2013-09-03 15:15:20 +07:00
Thomas Tanghus 53a7f80ac3 Use provided mimetype on open. Fix #4696 2013-09-02 23:53:45 +07:00
Jörn Friedrich Dreyer 7c9d999243 reduced complexity, added listing conflicts to dialog 2013-08-22 14:29:00 +07:00
kondou edd92e4c09 Merge branch 'master' into fix_jslint_kondou
Conflicts:
	apps/files/js/file-upload.js
2013-08-18 00:38:52 +07:00
kondou 2ee8425295 Remove cancel button from filepicker
Having the cancel button in the bottom right corner was a bit confusing.
It's useless anyways, since there's a X in the top right.
2013-08-17 12:07:58 +07:00
Jörn Friedrich Dreyer f94e603698 progress fixes 2013-08-16 11:40:55 +07:00
Jörn Friedrich Dreyer 9da49264ea change filelist ui updates 2013-08-14 17:49:45 +07:00
Jörn Friedrich Dreyer e1927d5bee fix whitespace, check selected files before starting upload 2013-08-14 10:55:12 +07:00
kondou 1348330c7d Fix a syntax error & have if-conds in an own line 2013-08-01 18:44:01 +07:00
kondou aaf0fec9f5 Fix some JSLint warnings 2013-07-31 21:21:02 +07:00
Thomas Tanghus 46d4886709 Set default button in oc-dialogs 2013-06-03 03:31:33 +07:00
Thomas Tanghus 5f1cbc6a1a Catch double destroy on escape. 2013-06-03 03:19:35 +07:00
Thomas Tanghus 901b1150ff Replacement for jquery.dialog to fit better with ownCloud design. 2013-06-02 21:52:59 +07:00
Thomas Tanghus 38b2d0a822 Remove more obsolete code. 2013-05-20 09:54:43 +07:00
Thomas Tanghus 27a5132b46 Don't set image path in template. 2013-05-20 09:44:31 +07:00
Thomas Tanghus c3779555aa Dialogs: Home folder icon instead of '/'. 2013-05-17 16:18:40 +07:00
Thomas Tanghus ba9849a1aa Dialogs: Fix method names. 2013-05-17 08:42:15 +07:00
Thomas Tanghus 2f91606e35 Dialogs: Cleanup. 2013-05-17 07:14:43 +07:00
Thomas Tanghus a0b79f5649 Dialogs: Loose up-button. 2013-05-17 06:48:24 +07:00
Thomas Tanghus e60d86bdd1 Dialogs: Make slug show last dir emphasized. 2013-05-17 06:16:51 +07:00
Thomas Tanghus 152e275c8a Various cleanups in OC.dialogs 2013-05-17 04:54:08 +07:00
Thomas Tanghus 913941d894 Line length etc. 2013-05-16 18:19:28 +07:00
Thomas Tanghus c8bbf90feb Port OC.dialogs to use octemplate except for prompt() and form().
Also load octemplate per default.
2013-05-16 13:41:04 +07:00
kondou e44cc8ea57 Fix OC.dialogs.form()
Don't do _too_ much escapeHTML()
2013-04-09 13:07:28 +07:00
kondou 9c53f35d9a Remove manual mimetype checking. 2013-04-08 23:00:02 +07:00
kondou 275badaf76 Make files _and_ directorys selectable/browsable.
Also make long variables more readable by splitting them
up into shorter ones.
2013-04-06 19:21:15 +07:00
kondou d556e7fbc0 Make files selectable again. 2013-04-06 17:22:55 +07:00
kondou 3e185911f1 Fix repeating directory names.
Also fix some CSS for Firefox.
2013-04-06 16:46:40 +07:00
kondou fba6681f71 Make directories show at top. 2013-04-06 14:42:56 +07:00
kondou 6231e5be39 Make directories clickable.
A bit bugged though ...
2013-04-06 14:17:47 +07:00
kondou 1919acd68f Small fixes
* escapeHTML(everything)
 * curly braces for if
 * camelcase function_to_call
 * add missing semicolae (?)
2013-04-06 12:16:55 +07:00
kondou 0be80abe70 Refactor OCdialogs.
Fix #2557 and make the whole code more usable.
2013-04-06 10:07:12 +07:00
Thomas Tanghus e9f46a7452 Remove inline js from OC.Dialogs.FilePicker. 2013-03-04 16:36:49 +07:00
libasys b095e32227 UPDATE oc-dialogs.js and Fix some small Bugs Added in the description of form a select ecample 2012-10-31 09:42:26 +07:00
libasys 0cf1fef3fa Fix for problems using for() function instead of $.each for arrays with IE8 2012-10-26 20:34:04 +07:00
scambra d5211f9615 some characters in comments avoid finding some strings to translate 2012-09-21 12:05:01 +07:00
scambra 0f15bc881f fix translating dialog buttons, they are translated in core not dialogs app 2012-09-21 11:48:57 +07:00
Bart Visscher a8de0af273 Add 'var' before some global js vars 2012-09-05 22:26:09 +07:00
Thomas Tanghus 2580d8540d Dialogs: Clean indentation. Add some missing brackets. 2012-05-05 13:49:47 +07:00
Thomas Tanghus a4a3d62a55 Check for callback in OC.dialogs.alert. 2012-05-04 00:13:35 +07:00
Bartek Przybylski 5611e6c9d3 fix incorrect dialog computing in ff 2012-05-03 12:32:37 +07:00
Thomas Tanghus 9c520c70a8 Various file path fixes. 2012-04-30 01:48:01 +07:00
Georg Ehrke 3f64eb25ab some fixes fore movable apps 2012-04-26 14:52:55 +07:00
Bartek Przybylski 96c99125da mimetype filter for filepicker 2012-04-05 23:18:44 +07:00
Bartek Przybylski 5b4a303672 loading screen for filepicker 2012-04-05 21:29:54 +07:00
Bartek Przybylski cd05dfb943 adding icons to filepicker 2012-04-03 22:18:03 +07:00
Bartek Przybylski ff5dbc52b8 multiselect handle for filepicker 2012-04-02 21:32:35 +07:00
Bartek Przybylski f21d6d4f9f dialogs filepicker first draft 2012-04-02 19:39:24 +07:00
Bartek Przybylski 4e327295c6 adding callback when ok click on alert dialog 2012-04-01 00:30:52 +07:00
Bartek Przybylski 6b704a780d select field added to oc.dialogs.form, gallery ported to use it 2012-03-30 22:50:57 +07:00
Bartek Przybylski cbdcb68c2b gallery sharing, experimental version 2012-03-24 18:35:42 +07:00
Bartek Przybylski c411826fe5 moving gallery op to one file, migrate gallery dialogs to oc dialogs 2012-03-04 00:35:37 +07:00
Bartek Przybylski 2754cac21f dialogs library for apps 2012-02-28 23:02:30 +07:00