glebtv-ckeditor 4.11.1 → 4.13.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +13 -12
- data/README.md +358 -2
- data/Rakefile +17 -8
- data/app/assets/javascripts/ckeditor/filebrowser/javascripts/fileuploader.js +313 -317
- data/app/controllers/ckeditor/application_controller.rb +3 -0
- data/app/controllers/ckeditor/attachment_files_controller.rb +2 -2
- data/app/controllers/ckeditor/pictures_controller.rb +2 -2
- data/app/helpers/ckeditor/application_helper.rb +2 -0
- data/app/views/ckeditor/shared/_asset.html.erb +1 -3
- data/app/views/ckeditor/shared/_asset_tmpl.html.erb +0 -2
- data/config/locales/da.ckeditor.yml +9 -0
- data/config/routes.rb +2 -0
- data/lib/ckeditor.rb +13 -19
- data/lib/ckeditor/asset_response.rb +17 -10
- data/lib/ckeditor/backend/active_storage.rb +68 -0
- data/lib/ckeditor/backend/carrierwave.rb +2 -12
- data/lib/ckeditor/backend/dragonfly.rb +2 -0
- data/lib/ckeditor/backend/paperclip.rb +2 -15
- data/lib/ckeditor/backend/shrine.rb +29 -0
- data/lib/ckeditor/helpers/controllers.rb +2 -0
- data/lib/ckeditor/helpers/form_builder.rb +2 -0
- data/lib/ckeditor/helpers/form_helper.rb +2 -0
- data/lib/ckeditor/helpers/view_helper.rb +2 -0
- data/lib/ckeditor/hooks/cancan.rb +4 -1
- data/lib/ckeditor/hooks/formtastic.rb +2 -0
- data/lib/ckeditor/hooks/pundit.rb +2 -0
- data/lib/ckeditor/hooks/simple_form.rb +2 -0
- data/lib/ckeditor/http.rb +14 -9
- data/lib/ckeditor/orm/active_record.rb +2 -0
- data/lib/ckeditor/orm/base.rb +11 -2
- data/lib/ckeditor/orm/mongoid.rb +2 -0
- data/lib/ckeditor/paginatable.rb +2 -0
- data/lib/ckeditor/rails.rb +2 -0
- data/lib/ckeditor/rails_admin/field.rb +16 -3
- data/lib/ckeditor/text_area.rb +2 -0
- data/lib/ckeditor/utils.rb +3 -16
- data/lib/ckeditor/utils/javascript_code.rb +1 -1
- data/lib/ckeditor/version.rb +4 -2
- data/lib/generators/ckeditor/install_generator.rb +16 -19
- data/lib/generators/ckeditor/pundit_policy_generator.rb +2 -0
- data/lib/generators/ckeditor/templates/active_record/active_storage/ckeditor/asset.rb +10 -0
- data/lib/generators/ckeditor/templates/active_record/{refile → active_storage}/ckeditor/attachment_file.rb +3 -1
- data/lib/generators/ckeditor/templates/active_record/active_storage/ckeditor/picture.rb +13 -0
- data/lib/generators/ckeditor/templates/active_record/{carrierwave/migration_versioned.rb → active_storage/migration.rb} +8 -5
- data/lib/generators/ckeditor/templates/active_record/carrierwave/ckeditor/asset.rb +2 -0
- data/lib/generators/ckeditor/templates/active_record/carrierwave/ckeditor/attachment_file.rb +2 -0
- data/lib/generators/ckeditor/templates/active_record/carrierwave/ckeditor/picture.rb +2 -0
- data/lib/generators/ckeditor/templates/active_record/carrierwave/migration.rb +7 -5
- data/lib/generators/ckeditor/templates/active_record/dragonfly/ckeditor/asset.rb +2 -0
- data/lib/generators/ckeditor/templates/active_record/dragonfly/ckeditor/attachment_file.rb +2 -0
- data/lib/generators/ckeditor/templates/active_record/dragonfly/ckeditor/picture.rb +2 -0
- data/lib/generators/ckeditor/templates/active_record/dragonfly/migration.rb +7 -5
- data/lib/generators/ckeditor/templates/active_record/paperclip/ckeditor/asset.rb +2 -0
- data/lib/generators/ckeditor/templates/active_record/paperclip/ckeditor/attachment_file.rb +2 -0
- data/lib/generators/ckeditor/templates/active_record/paperclip/ckeditor/picture.rb +2 -0
- data/lib/generators/ckeditor/templates/active_record/paperclip/migration.rb +8 -6
- data/lib/generators/ckeditor/templates/active_record/{refile → shrine}/ckeditor/asset.rb +3 -1
- data/lib/generators/ckeditor/templates/active_record/shrine/ckeditor/attachment_file.rb +21 -0
- data/lib/generators/ckeditor/templates/active_record/shrine/ckeditor/picture.rb +49 -0
- data/lib/generators/ckeditor/templates/active_record/shrine/migration.rb +22 -0
- data/lib/generators/ckeditor/templates/base/carrierwave/uploaders/ckeditor_attachment_file_uploader.rb +2 -1
- data/lib/generators/ckeditor/templates/base/carrierwave/uploaders/ckeditor_picture_uploader.rb +2 -3
- data/lib/generators/ckeditor/templates/base/dragonfly/initializer.rb +2 -0
- data/lib/generators/ckeditor/templates/base/shrine/initializer.rb +25 -0
- data/lib/generators/ckeditor/templates/ckeditor.rb +3 -6
- data/lib/generators/ckeditor/templates/mongoid/carrierwave/ckeditor/asset.rb +2 -0
- data/lib/generators/ckeditor/templates/mongoid/carrierwave/ckeditor/attachment_file.rb +2 -0
- data/lib/generators/ckeditor/templates/mongoid/carrierwave/ckeditor/picture.rb +2 -0
- data/lib/generators/ckeditor/templates/mongoid/paperclip/ckeditor/asset.rb +2 -0
- data/lib/generators/ckeditor/templates/mongoid/paperclip/ckeditor/attachment_file.rb +2 -0
- data/lib/generators/ckeditor/templates/mongoid/paperclip/ckeditor/picture.rb +2 -0
- data/lib/generators/ckeditor/templates/mongoid/shrine/ckeditor/asset.rb +8 -0
- data/lib/generators/ckeditor/templates/mongoid/shrine/ckeditor/attachment_file.rb +21 -0
- data/lib/generators/ckeditor/templates/mongoid/shrine/ckeditor/picture.rb +47 -0
- data/lib/generators/ckeditor/templates/pundit_policy/attachment_file_policy.rb +2 -0
- data/lib/generators/ckeditor/templates/pundit_policy/picture_policy.rb +2 -0
- data/lib/tasks/ckeditor.rake +2 -0
- data/test/controllers/attachment_files_controller_test.rb +17 -15
- data/test/controllers/pictures_controller_test.rb +17 -15
- data/test/dummy/Rakefile +2 -0
- data/test/dummy/app/assets/javascripts/application.js +0 -2
- data/test/dummy/app/controllers/application_controller.rb +2 -0
- data/test/dummy/app/controllers/posts_controller.rb +2 -0
- data/test/dummy/app/helpers/application_helper.rb +2 -0
- data/test/dummy/app/helpers/posts_helper.rb +2 -0
- data/test/dummy/app/models/post.rb +2 -0
- data/test/dummy/app/views/posts/index.html.erb +0 -3
- data/test/dummy/app/views/posts/show.html.erb +3 -0
- data/test/dummy/config.ru +2 -0
- data/test/dummy/config/application.rb +5 -1
- data/test/dummy/config/boot.rb +2 -0
- data/test/dummy/config/environment.rb +2 -0
- data/test/dummy/config/environments/development.rb +2 -0
- data/test/dummy/config/environments/production.rb +2 -0
- data/test/dummy/config/environments/test.rb +5 -3
- data/test/dummy/config/initializers/assets.rb +2 -0
- data/test/dummy/config/initializers/backtrace_silencers.rb +2 -0
- data/test/dummy/config/initializers/ckeditor.rb +2 -0
- data/test/dummy/config/initializers/cookies_serializer.rb +2 -0
- data/test/dummy/config/initializers/inflections.rb +2 -0
- data/test/dummy/config/initializers/mime_types.rb +2 -0
- data/test/dummy/config/initializers/paperclip.rb +2 -0
- data/test/dummy/config/initializers/session_store.rb +2 -0
- data/test/dummy/config/initializers/wrap_parameters.rb +2 -0
- data/test/dummy/config/routes.rb +2 -0
- data/test/dummy/config/storage.yml +3 -0
- data/test/dummy/db/migrate/20110623120047_create_posts.rb +5 -3
- data/test/dummy/db/migrate/20170806125915_create_active_storage_tables.rb +26 -0
- data/test/dummy/script/rails +2 -0
- data/test/functional/posts_controller_test.rb +18 -16
- data/test/generators/install_generator_test.rb +58 -56
- data/test/integration/navigation_test.rb +2 -0
- data/test/models/attachment_file_test.rb +4 -4
- data/test/models/ckeditor_test.rb +3 -21
- data/test/models/picture_test.rb +12 -10
- data/test/models/utils_test.rb +2 -0
- data/test/orm/active_record.rb +11 -1
- data/test/orm/mongoid.rb +2 -0
- data/test/support/helpers.rb +2 -0
- data/test/support/integration_case.rb +2 -0
- data/test/test_helper.rb +15 -9
- data/vendor/assets/javascripts/ckeditor/CHANGES.md +178 -2
- data/vendor/assets/javascripts/ckeditor/LICENSE.md +3 -2
- data/vendor/assets/javascripts/ckeditor/README.md +6 -6
- data/vendor/assets/javascripts/ckeditor/adapters/jquery.js +6 -6
- data/vendor/assets/javascripts/ckeditor/build-config.js +3 -4
- data/vendor/assets/javascripts/ckeditor/ckeditor.js +851 -816
- data/vendor/assets/javascripts/ckeditor/config.js +1 -1
- data/vendor/assets/javascripts/ckeditor/contents.css +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/en.js +1 -1
- data/vendor/assets/javascripts/ckeditor/lang/ru.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/en.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/about/dialogs/about.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/clipboard/dialogs/paste.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/css/codemirror.min.css +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/js/codemirror.addons.min.js +4 -2
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/js/codemirror.addons.search.min.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/js/codemirror.min.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/js/codemirror.mode.bbcodemixed.min.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/js/codemirror.mode.handlebars.min.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/js/codemirror.mode.htmlmixed.min.js +2 -2
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/js/codemirror.mode.javascript.min.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/js/codemirror.mode.php.min.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/js/codemirror.mode.twig.min.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/plugin.js +7 -3
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/3024-day.css +41 -41
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/3024-night.css +39 -39
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/abcdef.css +32 -32
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/ambiance-mobile.css +5 -5
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/ambiance.css +74 -74
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/base16-dark.css +38 -38
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/base16-light.css +38 -38
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/bespin.css +34 -34
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/blackboard.css +32 -32
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/cobalt.css +25 -25
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/colorforth.css +33 -33
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/darcula.css +51 -46
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/dracula.css +40 -40
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/duotone-dark.css +35 -35
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/duotone-light.css +36 -36
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/eclipse.css +23 -23
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/elegant.css +13 -13
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/erlang-dark.css +34 -34
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/gruvbox-dark.css +37 -34
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/hopscotch.css +34 -34
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/icecoder.css +43 -43
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/idea.css +41 -41
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/isotope.css +34 -34
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/lesser-dark.css +47 -47
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/liquibyte.css +95 -95
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/lucario.css +37 -37
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/material.css +53 -53
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/mbo.css +37 -37
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/mdn-like.css +46 -46
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/midnight.css +43 -43
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/monokai.css +41 -41
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/neat.css +12 -12
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/neo.css +43 -43
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/night.css +27 -27
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/nord.css +42 -0
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/oceanic-next.css +44 -44
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/panda-syntax.css +85 -85
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/paraiso-dark.css +38 -38
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/paraiso-light.css +38 -38
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/pastel-on-dark.css +52 -52
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/railscasts.css +34 -34
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/rubyblue.css +25 -25
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/seti.css +44 -44
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/shadowfox.css +52 -52
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/solarized.css +168 -168
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/ssms.css +16 -16
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/the-matrix.css +30 -30
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/tomorrow-night-bright.css +35 -35
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/tomorrow-night-eighties.css +38 -38
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/ttcn.css +64 -64
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/twilight.css +32 -32
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/vibrant-ink.css +34 -34
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/xq-dark.css +53 -53
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/xq-light.css +43 -43
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/yeti.css +44 -44
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/yonce.css +59 -0
- data/vendor/assets/javascripts/ckeditor/plugins/codemirror/theme/zenburn.css +37 -37
- data/vendor/assets/javascripts/ckeditor/plugins/colordialog/dialogs/colordialog.css +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/colordialog/dialogs/colordialog.js +11 -11
- data/vendor/assets/javascripts/ckeditor/plugins/dialog/dialogDefinition.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/dialog/styles/dialog.css +18 -0
- data/vendor/assets/javascripts/ckeditor/plugins/div/dialogs/div.js +9 -8
- data/vendor/assets/javascripts/ckeditor/plugins/find/dialogs/find.js +4 -4
- data/vendor/assets/javascripts/ckeditor/plugins/flash/dialogs/flash.js +16 -16
- data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/button.js +5 -5
- data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/checkbox.js +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/form.js +2 -2
- data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/hiddenfield.js +4 -4
- data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/radio.js +2 -2
- data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/select.js +16 -16
- data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/textarea.js +6 -5
- data/vendor/assets/javascripts/ckeditor/plugins/forms/dialogs/textfield.js +8 -8
- data/vendor/assets/javascripts/ckeditor/plugins/iframe/dialogs/iframe.js +8 -7
- data/vendor/assets/javascripts/ckeditor/plugins/image/dialogs/image.js +13 -1
- data/vendor/assets/javascripts/ckeditor/plugins/image/lang/en.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/image/lang/ru.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/image/plugin.js +2 -2
- data/vendor/assets/javascripts/ckeditor/plugins/image2/dev/contents.css +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/image2/dev/image2.html +2 -2
- data/vendor/assets/javascripts/ckeditor/plugins/image2/dialogs/image2.js +2 -2
- data/vendor/assets/javascripts/ckeditor/plugins/image2/lang/en.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/image2/lang/ru.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/image2/plugin.js +95 -32
- data/vendor/assets/javascripts/ckeditor/plugins/image2/samples/image2.html +3 -3
- data/vendor/assets/javascripts/ckeditor/plugins/link/dialogs/anchor.js +4 -4
- data/vendor/assets/javascripts/ckeditor/plugins/link/dialogs/link.js +25 -25
- data/vendor/assets/javascripts/ckeditor/plugins/liststyle/dialogs/liststyle.js +7 -7
- data/vendor/assets/javascripts/ckeditor/plugins/pastefromword/filter/default.js +40 -52
- data/vendor/assets/javascripts/ckeditor/plugins/pastetools/filter/common.js +19 -0
- data/vendor/assets/javascripts/ckeditor/plugins/scayt/README.md +63 -7
- data/vendor/assets/javascripts/ckeditor/plugins/scayt/dialogs/options.js +32 -32
- data/vendor/assets/javascripts/ckeditor/plugins/smiley/dialogs/smiley.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/en.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/lang/ru.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/specialchar/dialogs/specialchar.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/table/dialogs/table.js +19 -18
- data/vendor/assets/javascripts/ckeditor/plugins/tabletools/dialogs/tableCell.js +15 -15
- data/vendor/assets/javascripts/ckeditor/plugins/templates/dialogs/templates.css +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/templates/dialogs/templates.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/templates/templates/default.js +1 -1
- data/vendor/assets/javascripts/ckeditor/plugins/wordcount/plugin.js +13 -7
- data/vendor/assets/javascripts/ckeditor/plugins/wsc/README.md +62 -7
- data/vendor/assets/javascripts/ckeditor/plugins/wsc/dialogs/wsc.js +4 -4
- data/vendor/assets/javascripts/ckeditor/skins/minimalist/editor.css +1 -123
- data/vendor/assets/javascripts/ckeditor/skins/minimalist/editor_gecko.css +1 -1
- data/vendor/assets/javascripts/ckeditor/skins/minimalist/editor_ie.css +1 -1
- data/vendor/assets/javascripts/ckeditor/skins/minimalist/editor_ie7.css +1 -1
- data/vendor/assets/javascripts/ckeditor/skins/minimalist/editor_ie8.css +1 -1
- data/vendor/assets/javascripts/ckeditor/skins/minimalist/editor_iequirks.css +1 -1
- data/vendor/assets/javascripts/ckeditor/skins/minimalist/icons.png +0 -0
- data/vendor/assets/javascripts/ckeditor/skins/minimalist/icons_hidpi.png +0 -0
- data/vendor/assets/javascripts/ckeditor/skins/minimalist/skin.js +10 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/dialog.css +1 -1
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/dialog_ie.css +1 -1
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/dialog_ie8.css +1 -1
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/dialog_iequirks.css +1 -1
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/editor.css +2 -2
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/editor_gecko.css +2 -2
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/editor_ie.css +2 -2
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/editor_ie8.css +2 -2
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/editor_iequirks.css +2 -2
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/readme.md +1 -1
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/skin.js +1 -1
- data/vendor/assets/javascripts/ckeditor/skins/moono/dialog.css +1 -1
- data/vendor/assets/javascripts/ckeditor/skins/moono/dialog_ie.css +1 -1
- data/vendor/assets/javascripts/ckeditor/skins/moono/dialog_ie7.css +1 -1
- data/vendor/assets/javascripts/ckeditor/skins/moono/dialog_ie8.css +1 -1
- data/vendor/assets/javascripts/ckeditor/skins/moono/dialog_iequirks.css +1 -1
- data/vendor/assets/javascripts/ckeditor/skins/moono/editor.css +2 -2
- data/vendor/assets/javascripts/ckeditor/skins/moono/editor_gecko.css +2 -2
- data/vendor/assets/javascripts/ckeditor/skins/moono/editor_ie.css +2 -2
- data/vendor/assets/javascripts/ckeditor/skins/moono/editor_ie7.css +2 -2
- data/vendor/assets/javascripts/ckeditor/skins/moono/editor_ie8.css +2 -2
- data/vendor/assets/javascripts/ckeditor/skins/moono/editor_iequirks.css +2 -2
- data/vendor/assets/javascripts/ckeditor/skins/moono/readme.md +2 -2
- data/vendor/assets/javascripts/ckeditor/skins/moono/skin.js +1 -1
- data/vendor/assets/javascripts/ckeditor/styles.js +1 -1
- data/vendor/assets/javascripts/ckeditor/vendor/promise.js +13 -0
- metadata +65 -121
- data/lib/ckeditor/backend/refile.rb +0 -39
- data/lib/ckeditor/utils/content_type_detector.rb +0 -38
- data/lib/generators/ckeditor/templates/active_record/dragonfly/migration_versioned.rb +0 -23
- data/lib/generators/ckeditor/templates/active_record/paperclip/migration_versioned.rb +0 -23
- data/lib/generators/ckeditor/templates/active_record/refile/ckeditor/picture.rb +0 -11
- data/lib/generators/ckeditor/templates/active_record/refile/migration.rb +0 -23
- data/lib/generators/ckeditor/templates/active_record/refile/migration_versioned.rb +0 -23
- data/test/support/raw_post.rb +0 -9
- data/vendor/assets/javascripts/ckeditor/samples/css/samples.css +0 -1637
- data/vendor/assets/javascripts/ckeditor/samples/img/github-top.png +0 -0
- data/vendor/assets/javascripts/ckeditor/samples/img/header-bg.png +0 -0
- data/vendor/assets/javascripts/ckeditor/samples/img/header-separator.png +0 -0
- data/vendor/assets/javascripts/ckeditor/samples/img/logo.png +0 -0
- data/vendor/assets/javascripts/ckeditor/samples/img/logo.svg +0 -13
- data/vendor/assets/javascripts/ckeditor/samples/img/navigation-tip.png +0 -0
- data/vendor/assets/javascripts/ckeditor/samples/index.html +0 -128
- data/vendor/assets/javascripts/ckeditor/samples/js/sample.js +0 -53
- data/vendor/assets/javascripts/ckeditor/samples/js/sf.js +0 -17
- data/vendor/assets/javascripts/ckeditor/samples/old/ajax.html +0 -85
- data/vendor/assets/javascripts/ckeditor/samples/old/api.html +0 -210
- data/vendor/assets/javascripts/ckeditor/samples/old/appendto.html +0 -59
- data/vendor/assets/javascripts/ckeditor/samples/old/assets/inlineall/logo.png +0 -0
- data/vendor/assets/javascripts/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css +0 -204
- data/vendor/assets/javascripts/ckeditor/samples/old/assets/posteddata.php +0 -59
- data/vendor/assets/javascripts/ckeditor/samples/old/assets/sample.jpg +0 -0
- data/vendor/assets/javascripts/ckeditor/samples/old/assets/uilanguages/languages.js +0 -7
- data/vendor/assets/javascripts/ckeditor/samples/old/datafiltering.html +0 -508
- data/vendor/assets/javascripts/ckeditor/samples/old/dialog/assets/my_dialog.js +0 -48
- data/vendor/assets/javascripts/ckeditor/samples/old/dialog/dialog.html +0 -190
- data/vendor/assets/javascripts/ckeditor/samples/old/divreplace.html +0 -144
- data/vendor/assets/javascripts/ckeditor/samples/old/enterkey/enterkey.html +0 -106
- data/vendor/assets/javascripts/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.fla +0 -0
- data/vendor/assets/javascripts/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.swf +0 -0
- data/vendor/assets/javascripts/ckeditor/samples/old/htmlwriter/assets/outputforflash/swfobject.js +0 -19
- data/vendor/assets/javascripts/ckeditor/samples/old/htmlwriter/outputforflash.html +0 -283
- data/vendor/assets/javascripts/ckeditor/samples/old/htmlwriter/outputhtml.html +0 -224
- data/vendor/assets/javascripts/ckeditor/samples/old/index.html +0 -134
- data/vendor/assets/javascripts/ckeditor/samples/old/inlineall.html +0 -314
- data/vendor/assets/javascripts/ckeditor/samples/old/inlinebycode.html +0 -124
- data/vendor/assets/javascripts/ckeditor/samples/old/inlinetextarea.html +0 -113
- data/vendor/assets/javascripts/ckeditor/samples/old/jquery.html +0 -103
- data/vendor/assets/javascripts/ckeditor/samples/old/magicline/magicline.html +0 -209
- data/vendor/assets/javascripts/ckeditor/samples/old/readonly.html +0 -76
- data/vendor/assets/javascripts/ckeditor/samples/old/replacebyclass.html +0 -60
- data/vendor/assets/javascripts/ckeditor/samples/old/replacebycode.html +0 -59
- data/vendor/assets/javascripts/ckeditor/samples/old/sample.css +0 -357
- data/vendor/assets/javascripts/ckeditor/samples/old/sample.js +0 -50
- data/vendor/assets/javascripts/ckeditor/samples/old/sample_posteddata.php +0 -16
- data/vendor/assets/javascripts/ckeditor/samples/old/stylesheetparser/assets/sample.css +0 -70
- data/vendor/assets/javascripts/ckeditor/samples/old/stylesheetparser/stylesheetparser.html +0 -85
- data/vendor/assets/javascripts/ckeditor/samples/old/tabindex.html +0 -78
- data/vendor/assets/javascripts/ckeditor/samples/old/toolbar/toolbar.html +0 -235
- data/vendor/assets/javascripts/ckeditor/samples/old/uicolor.html +0 -72
- data/vendor/assets/javascripts/ckeditor/samples/old/uilanguages.html +0 -122
- data/vendor/assets/javascripts/ckeditor/samples/old/wysiwygarea/fullpage.html +0 -80
- data/vendor/assets/javascripts/ckeditor/samples/old/xhtmlstyle.html +0 -234
- data/vendor/assets/javascripts/ckeditor/samples/toolbarconfigurator/css/fontello.css +0 -55
- data/vendor/assets/javascripts/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt +0 -10
- data/vendor/assets/javascripts/ckeditor/samples/toolbarconfigurator/font/config.json +0 -28
- data/vendor/assets/javascripts/ckeditor/samples/toolbarconfigurator/font/fontello.eot +0 -0
- data/vendor/assets/javascripts/ckeditor/samples/toolbarconfigurator/font/fontello.svg +0 -14
- data/vendor/assets/javascripts/ckeditor/samples/toolbarconfigurator/font/fontello.ttf +0 -0
- data/vendor/assets/javascripts/ckeditor/samples/toolbarconfigurator/font/fontello.woff +0 -0
- data/vendor/assets/javascripts/ckeditor/samples/toolbarconfigurator/index.html +0 -446
- data/vendor/assets/javascripts/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js +0 -13
- data/vendor/assets/javascripts/ckeditor/samples/toolbarconfigurator/js/fulltoolbareditor.js +0 -9
- data/vendor/assets/javascripts/ckeditor/samples/toolbarconfigurator/js/toolbarmodifier.js +0 -33
- data/vendor/assets/javascripts/ckeditor/samples/toolbarconfigurator/js/toolbartextmodifier.js +0 -14
- data/vendor/assets/javascripts/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE +0 -19
- data/vendor/assets/javascripts/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css +0 -325
- data/vendor/assets/javascripts/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.js +0 -288
- data/vendor/assets/javascripts/ckeditor/samples/toolbarconfigurator/lib/codemirror/javascript.js +0 -25
- data/vendor/assets/javascripts/ckeditor/samples/toolbarconfigurator/lib/codemirror/neo.css +0 -36
- data/vendor/assets/javascripts/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.css +0 -38
- data/vendor/assets/javascripts/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.js +0 -16
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/icons.png +0 -0
- data/vendor/assets/javascripts/ckeditor/skins/moono-lisa/icons_hidpi.png +0 -0
@@ -1,11 +1,11 @@
|
|
1
1
|
/**
|
2
2
|
* http://github.com/valums/file-uploader
|
3
|
-
*
|
4
|
-
* Multiple file upload component with progress-bar, drag-and-drop.
|
5
|
-
* © 2010 Andrew Valums ( andrew(at)valums.com )
|
6
|
-
*
|
3
|
+
*
|
4
|
+
* Multiple file upload component with progress-bar, drag-and-drop.
|
5
|
+
* © 2010 Andrew Valums ( andrew(at)valums.com )
|
6
|
+
*
|
7
7
|
* Licensed under GNU GPL 2 or later, see license.txt.
|
8
|
-
*/
|
8
|
+
*/
|
9
9
|
|
10
10
|
//
|
11
11
|
// Helper functions
|
@@ -15,12 +15,12 @@ var qq = qq || {};
|
|
15
15
|
|
16
16
|
/**
|
17
17
|
* Adds all missing properties from second obj to first obj
|
18
|
-
*/
|
18
|
+
*/
|
19
19
|
qq.extend = function(first, second){
|
20
20
|
for (var prop in second){
|
21
21
|
first[prop] = second[prop];
|
22
22
|
}
|
23
|
-
};
|
23
|
+
};
|
24
24
|
|
25
25
|
/**
|
26
26
|
* Searches for a given element in the array, returns -1 if it is not present.
|
@@ -28,20 +28,20 @@ qq.extend = function(first, second){
|
|
28
28
|
*/
|
29
29
|
qq.indexOf = function(arr, elt, from){
|
30
30
|
if (arr.indexOf) return arr.indexOf(elt, from);
|
31
|
-
|
31
|
+
|
32
32
|
from = from || 0;
|
33
|
-
var len = arr.length;
|
33
|
+
var len = arr.length;
|
34
|
+
|
35
|
+
if (from < 0) from += len;
|
34
36
|
|
35
|
-
|
36
|
-
|
37
|
-
for (; from < len; from++){
|
38
|
-
if (from in arr && arr[from] === elt){
|
37
|
+
for (; from < len; from++){
|
38
|
+
if (from in arr && arr[from] === elt){
|
39
39
|
return from;
|
40
40
|
}
|
41
|
-
}
|
42
|
-
return -1;
|
43
|
-
};
|
44
|
-
|
41
|
+
}
|
42
|
+
return -1;
|
43
|
+
};
|
44
|
+
|
45
45
|
qq.getUniqueId = (function(){
|
46
46
|
var id = 0;
|
47
47
|
return function(){ return id++; };
|
@@ -86,10 +86,10 @@ qq.remove = function(element){
|
|
86
86
|
element.parentNode.removeChild(element);
|
87
87
|
};
|
88
88
|
|
89
|
-
qq.contains = function(parent, descendant){
|
89
|
+
qq.contains = function(parent, descendant){
|
90
90
|
// compareposition returns false in this case
|
91
91
|
if (parent == descendant) return true;
|
92
|
-
|
92
|
+
|
93
93
|
if (parent.contains){
|
94
94
|
return parent.contains(descendant);
|
95
95
|
} else {
|
@@ -181,7 +181,7 @@ qq.getByClass = function(element, className){
|
|
181
181
|
/**
|
182
182
|
* obj2url() takes a json-object as argument and generates
|
183
183
|
* a querystring. pretty much like jQuery.param()
|
184
|
-
*
|
184
|
+
*
|
185
185
|
* how to use:
|
186
186
|
*
|
187
187
|
* `qq.obj2url({a:'b',c:'d'},'http://any.url/upload?otherParam=value');`
|
@@ -198,21 +198,21 @@ qq.obj2url = function(obj, temp, prefixDone){
|
|
198
198
|
var uristrings = [],
|
199
199
|
prefix = '&',
|
200
200
|
add = function(nextObj, i){
|
201
|
-
var nextTemp = temp
|
201
|
+
var nextTemp = temp
|
202
202
|
? (/\[\]$/.test(temp)) // prevent double-encoding
|
203
203
|
? temp
|
204
204
|
: temp+'['+i+']'
|
205
205
|
: i;
|
206
|
-
if ((nextTemp != 'undefined') && (i != 'undefined')) {
|
206
|
+
if ((nextTemp != 'undefined') && (i != 'undefined')) {
|
207
207
|
uristrings.push(
|
208
|
-
(typeof nextObj === 'object')
|
208
|
+
(typeof nextObj === 'object')
|
209
209
|
? qq.obj2url(nextObj, nextTemp, true)
|
210
210
|
: (Object.prototype.toString.call(nextObj) === '[object Function]')
|
211
211
|
? encodeURIComponent(nextTemp) + '=' + encodeURIComponent(nextObj())
|
212
|
-
: encodeURIComponent(nextTemp) + '=' + encodeURIComponent(nextObj)
|
212
|
+
: encodeURIComponent(nextTemp) + '=' + encodeURIComponent(nextObj)
|
213
213
|
);
|
214
214
|
}
|
215
|
-
};
|
215
|
+
};
|
216
216
|
|
217
217
|
if (!prefixDone && temp) {
|
218
218
|
prefix = (/\?/.test(temp)) ? (/\?$/.test(temp)) ? '' : '&' : '?';
|
@@ -234,7 +234,7 @@ qq.obj2url = function(obj, temp, prefixDone){
|
|
234
234
|
|
235
235
|
return uristrings.join(prefix)
|
236
236
|
.replace(/^&/, '')
|
237
|
-
.replace(/%20/g, '+');
|
237
|
+
.replace(/%20/g, '+');
|
238
238
|
};
|
239
239
|
|
240
240
|
//
|
@@ -244,9 +244,9 @@ qq.obj2url = function(obj, temp, prefixDone){
|
|
244
244
|
//
|
245
245
|
|
246
246
|
var qq = qq || {};
|
247
|
-
|
247
|
+
|
248
248
|
/**
|
249
|
-
* Creates upload button, validates upload, but doesn't create file list or dd.
|
249
|
+
* Creates upload button, validates upload, but doesn't create file list or dd.
|
250
250
|
*/
|
251
251
|
qq.FileUploaderBasic = function(o){
|
252
252
|
this._options = {
|
@@ -259,9 +259,9 @@ qq.FileUploaderBasic = function(o){
|
|
259
259
|
maxConnections: 3,
|
260
260
|
method: 'POST',
|
261
261
|
fieldName: 'qqfile',
|
262
|
-
// validation
|
263
|
-
allowedExtensions: [],
|
264
|
-
sizeLimit: 0,
|
262
|
+
// validation
|
263
|
+
allowedExtensions: [],
|
264
|
+
sizeLimit: 0,
|
265
265
|
minSizeLimit: 0,
|
266
266
|
maxFilesCount: 0, // 0 - no limit, works only in multiple mode
|
267
267
|
minFilesCount: 0, // 0 - no limit, works only in multiple mode
|
@@ -271,7 +271,7 @@ qq.FileUploaderBasic = function(o){
|
|
271
271
|
onProgress: function(id, fileName, loaded, total){},
|
272
272
|
onComplete: function(id, fileName, responseJSON){},
|
273
273
|
onCancel: function(id, fileName){},
|
274
|
-
// messages
|
274
|
+
// messages
|
275
275
|
messages: {
|
276
276
|
typeError: "{file} has invalid extension. Only {extensions} are allowed.",
|
277
277
|
sizeError: "{file} is too large, maximum file size is {sizeLimit}.",
|
@@ -282,62 +282,62 @@ qq.FileUploaderBasic = function(o){
|
|
282
282
|
minFilesError: "You must select more then {minFilesCount} files."
|
283
283
|
},
|
284
284
|
showMessage: function(message){
|
285
|
-
|
286
|
-
}
|
285
|
+
alert(message);
|
286
|
+
}
|
287
287
|
};
|
288
288
|
qq.extend(this._options, o);
|
289
|
-
|
289
|
+
|
290
290
|
// number of files being uploaded
|
291
291
|
this._filesInProgress = 0;
|
292
292
|
// number of files was processed
|
293
293
|
this._filesUploaded = 0;
|
294
|
-
this._handler = this._createUploadHandler();
|
295
|
-
|
296
|
-
if (this._options.button){
|
294
|
+
this._handler = this._createUploadHandler();
|
295
|
+
|
296
|
+
if (this._options.button){
|
297
297
|
this._button = this._createUploadButton(this._options.button);
|
298
298
|
}
|
299
|
-
|
300
|
-
this._preventLeaveInProgress();
|
299
|
+
|
300
|
+
this._preventLeaveInProgress();
|
301
301
|
};
|
302
|
-
|
302
|
+
|
303
303
|
qq.FileUploaderBasic.prototype = {
|
304
304
|
setParams: function(params){
|
305
305
|
this._options.params = params;
|
306
306
|
},
|
307
307
|
getInProgress: function(){
|
308
|
-
return this._filesInProgress;
|
308
|
+
return this._filesInProgress;
|
309
309
|
},
|
310
310
|
_createUploadButton: function(element){
|
311
311
|
var self = this;
|
312
|
-
|
312
|
+
|
313
313
|
return new qq.UploadButton({
|
314
314
|
element: element,
|
315
315
|
multiple: this._options.multiple && qq.UploadHandlerXhr.isSupported(),
|
316
316
|
onChange: function(input){
|
317
317
|
self._onInputChange(input);
|
318
|
-
}
|
319
|
-
});
|
320
|
-
},
|
318
|
+
}
|
319
|
+
});
|
320
|
+
},
|
321
321
|
_createUploadHandler: function(){
|
322
322
|
var self = this,
|
323
|
-
handlerClass;
|
324
|
-
|
325
|
-
if(qq.UploadHandlerXhr.isSupported()){
|
326
|
-
handlerClass = 'UploadHandlerXhr';
|
323
|
+
handlerClass;
|
324
|
+
|
325
|
+
if(qq.UploadHandlerXhr.isSupported()){
|
326
|
+
handlerClass = 'UploadHandlerXhr';
|
327
327
|
} else {
|
328
328
|
handlerClass = 'UploadHandlerForm';
|
329
329
|
}
|
330
330
|
|
331
331
|
var handler = new qq[handlerClass]({
|
332
332
|
debug: this._options.debug,
|
333
|
-
action: this._options.action,
|
333
|
+
action: this._options.action,
|
334
334
|
maxConnections: this._options.maxConnections,
|
335
335
|
fieldName: this._options.fieldName,
|
336
|
-
method: this._options.method,
|
337
|
-
onProgress: function(id, fileName, loaded, total){
|
336
|
+
method: this._options.method,
|
337
|
+
onProgress: function(id, fileName, loaded, total){
|
338
338
|
self._onProgress(id, fileName, loaded, total);
|
339
|
-
self._options.onProgress(id, fileName, loaded, total);
|
340
|
-
},
|
339
|
+
self._options.onProgress(id, fileName, loaded, total);
|
340
|
+
},
|
341
341
|
onComplete: function(id, fileName, result){
|
342
342
|
self._onComplete(id, fileName, result);
|
343
343
|
self._options.onComplete(id, fileName, result);
|
@@ -349,94 +349,92 @@ qq.FileUploaderBasic.prototype = {
|
|
349
349
|
});
|
350
350
|
|
351
351
|
return handler;
|
352
|
-
},
|
352
|
+
},
|
353
353
|
_preventLeaveInProgress: function(){
|
354
354
|
var self = this;
|
355
|
-
|
355
|
+
|
356
356
|
qq.attach(window, 'beforeunload', function(e){
|
357
357
|
if (!self._filesInProgress){return;}
|
358
|
-
|
358
|
+
|
359
359
|
var e = e || window.event;
|
360
360
|
// for ie, ff
|
361
361
|
e.returnValue = self._options.messages.onLeave;
|
362
362
|
// for webkit
|
363
|
-
return self._options.messages.onLeave;
|
364
|
-
});
|
365
|
-
},
|
363
|
+
return self._options.messages.onLeave;
|
364
|
+
});
|
365
|
+
},
|
366
366
|
_onSubmit: function(id, fileName){
|
367
|
-
this._filesInProgress++;
|
367
|
+
this._filesInProgress++;
|
368
368
|
},
|
369
|
-
_onProgress: function(id, fileName, loaded, total){
|
369
|
+
_onProgress: function(id, fileName, loaded, total){
|
370
370
|
},
|
371
371
|
_onComplete: function(id, fileName, result){
|
372
|
-
this._filesInProgress--;
|
372
|
+
this._filesInProgress--;
|
373
373
|
if (result.error){
|
374
374
|
this._options.showMessage(result.error);
|
375
375
|
} else {
|
376
376
|
this._filesUploaded++;
|
377
|
-
}
|
377
|
+
}
|
378
378
|
},
|
379
379
|
_onCancel: function(id, fileName){
|
380
|
-
this._filesInProgress--;
|
380
|
+
this._filesInProgress--;
|
381
381
|
},
|
382
382
|
_onInputChange: function(input){
|
383
|
-
if (this._handler instanceof qq.UploadHandlerXhr){
|
384
|
-
this._uploadFileList(input.files);
|
385
|
-
} else {
|
386
|
-
if (this._validateFile(input)){
|
387
|
-
this._uploadFile(input);
|
388
|
-
}
|
389
|
-
}
|
390
|
-
this._button.reset();
|
391
|
-
},
|
383
|
+
if (this._handler instanceof qq.UploadHandlerXhr){
|
384
|
+
this._uploadFileList(input.files);
|
385
|
+
} else {
|
386
|
+
if (this._validateFile(input)){
|
387
|
+
this._uploadFile(input);
|
388
|
+
}
|
389
|
+
}
|
390
|
+
this._button.reset();
|
391
|
+
},
|
392
392
|
_uploadFileList: function(files){
|
393
393
|
if ( this._validateFiles(files) ) {
|
394
394
|
for (var i=0; i<files.length; i++){
|
395
|
-
this._uploadFile(files[i]);
|
395
|
+
this._uploadFile(files[i]);
|
396
396
|
}
|
397
397
|
}
|
398
|
-
},
|
399
|
-
_uploadFile: function(fileContainer){
|
398
|
+
},
|
399
|
+
_uploadFile: function(fileContainer){
|
400
400
|
var id = this._handler.add(fileContainer);
|
401
401
|
var fileName = this._handler.getName(id);
|
402
|
-
|
402
|
+
|
403
403
|
if (this._options.onSubmit(id, fileName) !== false){
|
404
|
-
|
405
|
-
|
406
|
-
console.log(id, this._options.params)
|
407
|
-
this._handler.upload(id, this._options.params);
|
404
|
+
this._onSubmit(id, fileName);
|
405
|
+
this._handler.upload(id, this._options.params);
|
408
406
|
}
|
409
407
|
},
|
410
408
|
_validateFiles: function(files){
|
411
409
|
var uploadedCount = this._filesUploaded + files.length;
|
412
|
-
|
410
|
+
|
413
411
|
if (this._options.maxFilesCount > 0) {
|
414
|
-
if ( uploadedCount > this._options.maxFilesCount) {
|
412
|
+
if ( uploadedCount > this._options.maxFilesCount) {
|
415
413
|
this._error('maxFilesError', 'name');
|
416
414
|
return false;
|
417
415
|
}
|
418
416
|
}
|
419
|
-
|
417
|
+
|
420
418
|
if (this._options.minFilesCount > 0) {
|
421
419
|
if ( uploadedCount < this._options.minFilesCount) {
|
422
420
|
this._error('minFilesError', 'name');
|
423
421
|
return false;
|
424
422
|
}
|
425
423
|
}
|
426
|
-
|
424
|
+
|
427
425
|
for (var i=0; i<files.length; i++){
|
428
426
|
if ( !this._validateFile(files[i])){
|
429
427
|
return false;
|
430
|
-
}
|
428
|
+
}
|
431
429
|
}
|
432
|
-
|
430
|
+
|
433
431
|
return true;
|
434
|
-
},
|
432
|
+
},
|
435
433
|
_validateFile: function(file){
|
436
434
|
var name, size;
|
437
|
-
|
435
|
+
|
438
436
|
if (file.value){
|
439
|
-
// it is a file input
|
437
|
+
// it is a file input
|
440
438
|
// get input value and remove path to normalize
|
441
439
|
name = file.value.replace(/.*(\/|\\)/, "");
|
442
440
|
} else {
|
@@ -444,69 +442,69 @@ qq.FileUploaderBasic.prototype = {
|
|
444
442
|
name = file.fileName != null ? file.fileName : file.name;
|
445
443
|
size = file.fileSize != null ? file.fileSize : file.size;
|
446
444
|
}
|
447
|
-
|
448
|
-
if (! this._isAllowedExtension(name)){
|
445
|
+
|
446
|
+
if (! this._isAllowedExtension(name)){
|
449
447
|
this._error('typeError', name);
|
450
448
|
return false;
|
451
|
-
|
452
|
-
} else if (size === 0){
|
449
|
+
|
450
|
+
} else if (size === 0){
|
453
451
|
this._error('emptyError', name);
|
454
452
|
return false;
|
455
|
-
|
456
|
-
} else if (size && this._options.sizeLimit && size > this._options.sizeLimit){
|
453
|
+
|
454
|
+
} else if (size && this._options.sizeLimit && size > this._options.sizeLimit){
|
457
455
|
this._error('sizeError', name);
|
458
456
|
return false;
|
459
|
-
|
457
|
+
|
460
458
|
} else if (size && size < this._options.minSizeLimit){
|
461
459
|
this._error('minSizeError', name);
|
462
|
-
return false;
|
460
|
+
return false;
|
463
461
|
}
|
464
|
-
|
465
|
-
return true;
|
462
|
+
|
463
|
+
return true;
|
466
464
|
},
|
467
465
|
_error: function(code, fileName){
|
468
|
-
var message = this._options.messages[code];
|
466
|
+
var message = this._options.messages[code];
|
469
467
|
function r(name, replacement){ message = message.replace(name, replacement); }
|
470
|
-
|
471
|
-
r('{file}', this._formatFileName(fileName));
|
468
|
+
|
469
|
+
r('{file}', this._formatFileName(fileName));
|
472
470
|
r('{extensions}', this._options.allowedExtensions.join(', '));
|
473
471
|
r('{sizeLimit}', this._formatSize(this._options.sizeLimit));
|
474
472
|
r('{minSizeLimit}', this._formatSize(this._options.minSizeLimit));
|
475
473
|
r('{maxFilesCount}', this._options.maxFilesCount);
|
476
474
|
r('{minFilesCount}', this._options.minFilesCount);
|
477
|
-
|
478
|
-
this._options.showMessage(message);
|
475
|
+
|
476
|
+
this._options.showMessage(message);
|
479
477
|
},
|
480
478
|
_formatFileName: function(name){
|
481
479
|
if (name.length > 33){
|
482
|
-
name = name.slice(0, 19) + '...' + name.slice(-13);
|
480
|
+
name = name.slice(0, 19) + '...' + name.slice(-13);
|
483
481
|
}
|
484
482
|
return name;
|
485
483
|
},
|
486
484
|
_isAllowedExtension: function(fileName){
|
487
485
|
var ext = (-1 !== fileName.indexOf('.')) ? fileName.replace(/.*[.]/, '').toLowerCase() : '';
|
488
486
|
var allowed = this._options.allowedExtensions;
|
489
|
-
|
490
|
-
if (!allowed.length){return true;}
|
491
|
-
|
487
|
+
|
488
|
+
if (!allowed.length){return true;}
|
489
|
+
|
492
490
|
for (var i=0; i<allowed.length; i++){
|
493
|
-
if (allowed[i].toLowerCase() == ext){ return true;}
|
491
|
+
if (allowed[i].toLowerCase() == ext){ return true;}
|
494
492
|
}
|
495
|
-
|
493
|
+
|
496
494
|
return false;
|
497
|
-
},
|
495
|
+
},
|
498
496
|
_formatSize: function(bytes){
|
499
|
-
var i = -1;
|
497
|
+
var i = -1;
|
500
498
|
do {
|
501
499
|
bytes = bytes / 1024;
|
502
|
-
i++;
|
500
|
+
i++;
|
503
501
|
} while (bytes > 99);
|
504
|
-
|
505
|
-
return Math.max(bytes, 0.1).toFixed(1) + ['kB', 'MB', 'GB', 'TB', 'PB', 'EB'][i];
|
502
|
+
|
503
|
+
return Math.max(bytes, 0.1).toFixed(1) + ['kB', 'MB', 'GB', 'TB', 'PB', 'EB'][i];
|
506
504
|
}
|
507
505
|
};
|
508
|
-
|
509
|
-
|
506
|
+
|
507
|
+
|
510
508
|
/**
|
511
509
|
* Class that creates upload widget with drag-and-drop and file list
|
512
510
|
* @inherits qq.FileUploaderBasic
|
@@ -514,17 +512,17 @@ qq.FileUploaderBasic.prototype = {
|
|
514
512
|
qq.FileUploader = function(o){
|
515
513
|
// call parent constructor
|
516
514
|
qq.FileUploaderBasic.apply(this, arguments);
|
517
|
-
|
518
|
-
// additional options
|
515
|
+
|
516
|
+
// additional options
|
519
517
|
qq.extend(this._options, {
|
520
518
|
element: null,
|
521
519
|
// if set, will be used instead of qq-upload-list in template
|
522
520
|
listElement: null,
|
523
|
-
|
524
|
-
template: '<div class="qq-uploader">' +
|
521
|
+
|
522
|
+
template: '<div class="qq-uploader">' +
|
525
523
|
'<div class="qq-upload-drop-area"><span>Drop files here to upload</span></div>' +
|
526
524
|
'<div class="qq-upload-button">Upload a file</div>' +
|
527
|
-
'<ul class="qq-upload-list"></ul>' +
|
525
|
+
'<ul class="qq-upload-list"></ul>' +
|
528
526
|
'</div>',
|
529
527
|
|
530
528
|
// template for one item in file list
|
@@ -534,15 +532,15 @@ qq.FileUploader = function(o){
|
|
534
532
|
'<span class="qq-upload-size"></span>' +
|
535
533
|
'<a class="qq-upload-cancel" href="#">Cancel</a>' +
|
536
534
|
'<span class="qq-upload-failed-text">Failed</span>' +
|
537
|
-
'</li>',
|
538
|
-
|
535
|
+
'</li>',
|
536
|
+
|
539
537
|
classes: {
|
540
538
|
// used to get elements from templates
|
541
539
|
button: 'qq-upload-button',
|
542
540
|
drop: 'qq-upload-drop-area',
|
543
541
|
dropActive: 'qq-upload-drop-area-active',
|
544
542
|
list: 'qq-upload-list',
|
545
|
-
|
543
|
+
|
546
544
|
file: 'qq-upload-file',
|
547
545
|
spinner: 'qq-upload-spinner',
|
548
546
|
size: 'qq-upload-size',
|
@@ -554,17 +552,17 @@ qq.FileUploader = function(o){
|
|
554
552
|
fail: 'qq-upload-fail'
|
555
553
|
}
|
556
554
|
});
|
557
|
-
// overwrite options with user supplied
|
558
|
-
qq.extend(this._options, o);
|
555
|
+
// overwrite options with user supplied
|
556
|
+
qq.extend(this._options, o);
|
559
557
|
|
560
558
|
this._element = this._options.element;
|
561
|
-
this._element.innerHTML = this._options.template;
|
559
|
+
this._element.innerHTML = this._options.template;
|
562
560
|
this._listElement = this._options.listElement || this._find(this._element, 'list');
|
563
|
-
|
561
|
+
|
564
562
|
this._classes = this._options.classes;
|
565
|
-
|
566
|
-
this._button = this._createUploadButton(this._find(this._element, 'button'));
|
567
|
-
|
563
|
+
|
564
|
+
this._button = this._createUploadButton(this._find(this._element, 'button'));
|
565
|
+
|
568
566
|
this._bindCancelEvent();
|
569
567
|
this._setupDragDrop();
|
570
568
|
};
|
@@ -576,17 +574,17 @@ qq.extend(qq.FileUploader.prototype, {
|
|
576
574
|
/**
|
577
575
|
* Gets one of the elements listed in this._options.classes
|
578
576
|
**/
|
579
|
-
_find: function(parent, type){
|
580
|
-
var element = qq.getByClass(parent, this._options.classes[type])[0];
|
577
|
+
_find: function(parent, type){
|
578
|
+
var element = qq.getByClass(parent, this._options.classes[type])[0];
|
581
579
|
if (!element){
|
582
580
|
throw new Error('element not found ' + type);
|
583
581
|
}
|
584
|
-
|
582
|
+
|
585
583
|
return element;
|
586
584
|
},
|
587
585
|
_setupDragDrop: function(){
|
588
586
|
var self = this,
|
589
|
-
dropArea = this._find(this._element, 'drop');
|
587
|
+
dropArea = this._find(this._element, 'drop');
|
590
588
|
|
591
589
|
var dz = new qq.UploadDropZone({
|
592
590
|
element: dropArea,
|
@@ -598,35 +596,35 @@ qq.extend(qq.FileUploader.prototype, {
|
|
598
596
|
e.stopPropagation();
|
599
597
|
},
|
600
598
|
onLeaveNotDescendants: function(e){
|
601
|
-
qq.removeClass(dropArea, self._classes.dropActive);
|
599
|
+
qq.removeClass(dropArea, self._classes.dropActive);
|
602
600
|
},
|
603
601
|
onDrop: function(e){
|
604
602
|
dropArea.style.display = 'none';
|
605
603
|
qq.removeClass(dropArea, self._classes.dropActive);
|
606
|
-
self._uploadFileList(e.dataTransfer.files);
|
604
|
+
self._uploadFileList(e.dataTransfer.files);
|
607
605
|
}
|
608
606
|
});
|
609
|
-
|
607
|
+
|
610
608
|
dropArea.style.display = 'none';
|
611
609
|
|
612
|
-
qq.attach(document, 'dragenter', function(e){
|
613
|
-
if (!dz._isValidFileDrag(e)) return;
|
614
|
-
|
615
|
-
dropArea.style.display = 'block';
|
616
|
-
});
|
610
|
+
qq.attach(document, 'dragenter', function(e){
|
611
|
+
if (!dz._isValidFileDrag(e)) return;
|
612
|
+
|
613
|
+
dropArea.style.display = 'block';
|
614
|
+
});
|
617
615
|
qq.attach(document, 'dragleave', function(e){
|
618
|
-
if (!dz._isValidFileDrag(e)) return;
|
619
|
-
|
616
|
+
if (!dz._isValidFileDrag(e)) return;
|
617
|
+
|
620
618
|
var relatedTarget = document.elementFromPoint(e.clientX, e.clientY);
|
621
619
|
// only fire when leaving document out
|
622
|
-
if ( ! relatedTarget || relatedTarget.nodeName == "HTML"){
|
623
|
-
dropArea.style.display = 'none';
|
620
|
+
if ( ! relatedTarget || relatedTarget.nodeName == "HTML"){
|
621
|
+
dropArea.style.display = 'none';
|
624
622
|
}
|
625
|
-
});
|
623
|
+
});
|
626
624
|
},
|
627
625
|
_onSubmit: function(id, fileName){
|
628
626
|
qq.FileUploaderBasic.prototype._onSubmit.apply(this, arguments);
|
629
|
-
this._addToList(id, fileName);
|
627
|
+
this._addToList(id, fileName);
|
630
628
|
},
|
631
629
|
_onProgress: function(id, fileName, loaded, total){
|
632
630
|
qq.FileUploaderBasic.prototype._onProgress.apply(this, arguments);
|
@@ -634,87 +632,87 @@ qq.extend(qq.FileUploader.prototype, {
|
|
634
632
|
var item = this._getItemByFileId(id);
|
635
633
|
var size = this._find(item, 'size');
|
636
634
|
size.style.display = 'inline';
|
637
|
-
|
638
|
-
var text;
|
635
|
+
|
636
|
+
var text;
|
639
637
|
if (loaded != total){
|
640
638
|
text = Math.round(loaded / total * 100) + '% from ' + this._formatSize(total);
|
641
|
-
} else {
|
639
|
+
} else {
|
642
640
|
text = this._formatSize(total);
|
643
|
-
}
|
644
|
-
|
645
|
-
qq.setText(size, text);
|
641
|
+
}
|
642
|
+
|
643
|
+
qq.setText(size, text);
|
646
644
|
},
|
647
645
|
_onComplete: function(id, fileName, result){
|
648
646
|
qq.FileUploaderBasic.prototype._onComplete.apply(this, arguments);
|
649
647
|
|
650
648
|
// mark completed
|
651
|
-
var item = this._getItemByFileId(id);
|
649
|
+
var item = this._getItemByFileId(id);
|
652
650
|
qq.remove(this._find(item, 'cancel'));
|
653
651
|
qq.remove(this._find(item, 'spinner'));
|
654
|
-
|
652
|
+
|
655
653
|
if (result.success){
|
656
|
-
qq.addClass(item, this._classes.success);
|
654
|
+
qq.addClass(item, this._classes.success);
|
657
655
|
} else {
|
658
656
|
qq.addClass(item, this._classes.fail);
|
659
|
-
}
|
657
|
+
}
|
660
658
|
},
|
661
659
|
_addToList: function(id, fileName){
|
662
|
-
var item = qq.toElement(this._options.fileTemplate);
|
660
|
+
var item = qq.toElement(this._options.fileTemplate);
|
663
661
|
item.qqFileId = id;
|
664
662
|
|
665
|
-
var fileElement = this._find(item, 'file');
|
663
|
+
var fileElement = this._find(item, 'file');
|
666
664
|
qq.setText(fileElement, this._formatFileName(fileName));
|
667
|
-
this._find(item, 'size').style.display = 'none';
|
665
|
+
this._find(item, 'size').style.display = 'none';
|
668
666
|
|
669
667
|
this._listElement.appendChild(item);
|
670
668
|
},
|
671
669
|
_getItemByFileId: function(id){
|
672
|
-
var item = this._listElement.firstChild;
|
673
|
-
|
670
|
+
var item = this._listElement.firstChild;
|
671
|
+
|
674
672
|
// there can't be txt nodes in dynamically created list
|
675
673
|
// and we can use nextSibling
|
676
|
-
while (item){
|
677
|
-
if (item.qqFileId == id) return item;
|
674
|
+
while (item){
|
675
|
+
if (item.qqFileId == id) return item;
|
678
676
|
item = item.nextSibling;
|
679
|
-
}
|
677
|
+
}
|
680
678
|
},
|
681
679
|
/**
|
682
|
-
* delegate click event for cancel link
|
680
|
+
* delegate click event for cancel link
|
683
681
|
**/
|
684
682
|
_bindCancelEvent: function(){
|
685
683
|
var self = this,
|
686
|
-
list = this._listElement;
|
687
|
-
|
688
|
-
qq.attach(list, 'click', function(e){
|
684
|
+
list = this._listElement;
|
685
|
+
|
686
|
+
qq.attach(list, 'click', function(e){
|
689
687
|
e = e || window.event;
|
690
688
|
var target = e.target || e.srcElement;
|
691
|
-
|
692
|
-
if (qq.hasClass(target, self._classes.cancel)){
|
689
|
+
|
690
|
+
if (qq.hasClass(target, self._classes.cancel)){
|
693
691
|
qq.preventDefault(e);
|
694
|
-
|
692
|
+
|
695
693
|
var item = target.parentNode;
|
696
694
|
self._handler.cancel(item.qqFileId);
|
697
695
|
qq.remove(item);
|
698
696
|
}
|
699
697
|
});
|
700
|
-
}
|
698
|
+
}
|
701
699
|
});
|
702
|
-
|
700
|
+
|
703
701
|
qq.UploadDropZone = function(o){
|
704
702
|
this._options = {
|
705
|
-
element: null,
|
703
|
+
element: null,
|
706
704
|
onEnter: function(e){},
|
707
|
-
onLeave: function(e){},
|
708
|
-
// is not fired when leaving element by hovering descendants
|
709
|
-
onLeaveNotDescendants: function(e){},
|
710
|
-
onDrop: function(e){}
|
705
|
+
onLeave: function(e){},
|
706
|
+
// is not fired when leaving element by hovering descendants
|
707
|
+
onLeaveNotDescendants: function(e){},
|
708
|
+
onDrop: function(e){}
|
711
709
|
};
|
712
|
-
qq.extend(this._options, o);
|
713
|
-
|
710
|
+
qq.extend(this._options, o);
|
711
|
+
|
714
712
|
this._element = this._options.element;
|
715
|
-
|
713
|
+
|
716
714
|
this._disableDropOutside();
|
717
|
-
this._attachEvents();
|
715
|
+
this._attachEvents();
|
718
716
|
};
|
719
717
|
|
720
718
|
qq.UploadDropZone.prototype = {
|
@@ -725,84 +723,84 @@ qq.UploadDropZone.prototype = {
|
|
725
723
|
qq.attach(document, 'dragover', function(e){
|
726
724
|
if (e.dataTransfer){
|
727
725
|
e.dataTransfer.dropEffect = 'none';
|
728
|
-
e.preventDefault();
|
729
|
-
}
|
726
|
+
e.preventDefault();
|
727
|
+
}
|
730
728
|
});
|
731
|
-
|
732
|
-
qq.UploadDropZone.dropOutsideDisabled = true;
|
733
|
-
}
|
729
|
+
|
730
|
+
qq.UploadDropZone.dropOutsideDisabled = true;
|
731
|
+
}
|
734
732
|
},
|
735
733
|
_attachEvents: function(){
|
736
|
-
var self = this;
|
737
|
-
|
734
|
+
var self = this;
|
735
|
+
|
738
736
|
qq.attach(self._element, 'dragover', function(e){
|
739
737
|
if (!self._isValidFileDrag(e)) return;
|
740
|
-
|
738
|
+
|
741
739
|
var effect = e.dataTransfer.effectAllowed;
|
742
740
|
if (effect == 'move' || effect == 'linkMove'){
|
743
|
-
e.dataTransfer.dropEffect = 'move'; // for FF (only move allowed)
|
744
|
-
} else {
|
741
|
+
e.dataTransfer.dropEffect = 'move'; // for FF (only move allowed)
|
742
|
+
} else {
|
745
743
|
e.dataTransfer.dropEffect = 'copy'; // for Chrome
|
746
744
|
}
|
747
|
-
|
745
|
+
|
748
746
|
e.stopPropagation();
|
749
|
-
e.preventDefault();
|
747
|
+
e.preventDefault();
|
750
748
|
});
|
751
|
-
|
749
|
+
|
752
750
|
qq.attach(self._element, 'dragenter', function(e){
|
753
751
|
if (!self._isValidFileDrag(e)) return;
|
754
|
-
|
752
|
+
|
755
753
|
self._options.onEnter(e);
|
756
754
|
});
|
757
|
-
|
755
|
+
|
758
756
|
qq.attach(self._element, 'dragleave', function(e){
|
759
757
|
if (!self._isValidFileDrag(e)) return;
|
760
|
-
|
758
|
+
|
761
759
|
self._options.onLeave(e);
|
762
|
-
|
763
|
-
var relatedTarget = document.elementFromPoint(e.clientX, e.clientY);
|
760
|
+
|
761
|
+
var relatedTarget = document.elementFromPoint(e.clientX, e.clientY);
|
764
762
|
// do not fire when moving a mouse over a descendant
|
765
763
|
if (qq.contains(this, relatedTarget)) return;
|
766
|
-
|
767
|
-
self._options.onLeaveNotDescendants(e);
|
764
|
+
|
765
|
+
self._options.onLeaveNotDescendants(e);
|
768
766
|
});
|
769
|
-
|
767
|
+
|
770
768
|
qq.attach(self._element, 'drop', function(e){
|
771
769
|
if (!self._isValidFileDrag(e)) return;
|
772
|
-
|
770
|
+
|
773
771
|
e.preventDefault();
|
774
772
|
self._options.onDrop(e);
|
775
|
-
});
|
773
|
+
});
|
776
774
|
},
|
777
775
|
_isValidFileDrag: function(e){
|
778
776
|
var dt = e.dataTransfer,
|
779
|
-
// do not check dt.types.contains in webkit, because it crashes safari 4
|
780
|
-
isWebkit = navigator.userAgent.indexOf("AppleWebKit") > -1;
|
777
|
+
// do not check dt.types.contains in webkit, because it crashes safari 4
|
778
|
+
isWebkit = navigator.userAgent.indexOf("AppleWebKit") > -1;
|
781
779
|
|
782
780
|
// dt.effectAllowed is none in Safari 5
|
783
|
-
// dt.types.contains check is for firefox
|
784
|
-
return dt && dt.effectAllowed != 'none' &&
|
781
|
+
// dt.types.contains check is for firefox
|
782
|
+
return dt && dt.effectAllowed != 'none' &&
|
785
783
|
(dt.files || (!isWebkit && dt.types.contains && dt.types.contains('Files')));
|
786
|
-
|
787
|
-
}
|
788
|
-
};
|
784
|
+
|
785
|
+
}
|
786
|
+
};
|
789
787
|
|
790
788
|
qq.UploadButton = function(o){
|
791
789
|
this._options = {
|
792
|
-
element: null,
|
793
|
-
// if set to true adds multiple attribute to file input
|
790
|
+
element: null,
|
791
|
+
// if set to true adds multiple attribute to file input
|
794
792
|
multiple: false,
|
795
793
|
// name attribute of file input
|
796
794
|
name: 'file',
|
797
795
|
onChange: function(input){},
|
798
796
|
hoverClass: 'qq-upload-button-hover',
|
799
|
-
focusClass: 'qq-upload-button-focus'
|
797
|
+
focusClass: 'qq-upload-button-focus'
|
800
798
|
};
|
801
|
-
|
799
|
+
|
802
800
|
qq.extend(this._options, o);
|
803
|
-
|
801
|
+
|
804
802
|
this._element = this._options.element;
|
805
|
-
|
803
|
+
|
806
804
|
// make button suitable container for input
|
807
805
|
qq.css(this._element, {
|
808
806
|
position: 'relative',
|
@@ -810,35 +808,35 @@ qq.UploadButton = function(o){
|
|
810
808
|
// Make sure browse button is in the right side
|
811
809
|
// in Internet Explorer
|
812
810
|
direction: 'ltr'
|
813
|
-
});
|
814
|
-
|
811
|
+
});
|
812
|
+
|
815
813
|
this._input = this._createInput();
|
816
814
|
};
|
817
815
|
|
818
816
|
qq.UploadButton.prototype = {
|
819
|
-
/* returns file input element */
|
817
|
+
/* returns file input element */
|
820
818
|
getInput: function(){
|
821
819
|
return this._input;
|
822
820
|
},
|
823
821
|
/* cleans/recreates the file input */
|
824
822
|
reset: function(){
|
825
823
|
if (this._input.parentNode){
|
826
|
-
qq.remove(this._input);
|
827
|
-
}
|
828
|
-
|
824
|
+
qq.remove(this._input);
|
825
|
+
}
|
826
|
+
|
829
827
|
qq.removeClass(this._element, this._options.focusClass);
|
830
828
|
this._input = this._createInput();
|
831
|
-
},
|
832
|
-
_createInput: function(){
|
829
|
+
},
|
830
|
+
_createInput: function(){
|
833
831
|
var input = document.createElement("input");
|
834
|
-
|
832
|
+
|
835
833
|
if (this._options.multiple){
|
836
834
|
input.setAttribute("multiple", "multiple");
|
837
835
|
}
|
838
|
-
|
836
|
+
|
839
837
|
input.setAttribute("type", "file");
|
840
838
|
input.setAttribute("name", this._options.name);
|
841
|
-
|
839
|
+
|
842
840
|
qq.css(input, {
|
843
841
|
position: 'absolute',
|
844
842
|
// in Opera only 'browse' button
|
@@ -854,14 +852,14 @@ qq.UploadButton.prototype = {
|
|
854
852
|
cursor: 'pointer',
|
855
853
|
opacity: 0
|
856
854
|
});
|
857
|
-
|
855
|
+
|
858
856
|
this._element.appendChild(input);
|
859
857
|
|
860
858
|
var self = this;
|
861
859
|
qq.attach(input, 'change', function(){
|
862
860
|
self._options.onChange(input);
|
863
861
|
});
|
864
|
-
|
862
|
+
|
865
863
|
qq.attach(input, 'mouseover', function(){
|
866
864
|
qq.addClass(self._element, self._options.hoverClass);
|
867
865
|
});
|
@@ -882,8 +880,8 @@ qq.UploadButton.prototype = {
|
|
882
880
|
input.setAttribute('tabIndex', "-1");
|
883
881
|
}
|
884
882
|
|
885
|
-
return input;
|
886
|
-
}
|
883
|
+
return input;
|
884
|
+
}
|
887
885
|
};
|
888
886
|
|
889
887
|
/**
|
@@ -895,26 +893,26 @@ qq.UploadHandlerAbstract = function(o){
|
|
895
893
|
action: '/upload.php',
|
896
894
|
method: 'POST',
|
897
895
|
fieldName: 'qqfile',
|
898
|
-
// maximum number of concurrent uploads
|
896
|
+
// maximum number of concurrent uploads
|
899
897
|
maxConnections: 999,
|
900
898
|
onProgress: function(id, fileName, loaded, total){},
|
901
899
|
onComplete: function(id, fileName, response){},
|
902
900
|
onCancel: function(id, fileName){}
|
903
901
|
};
|
904
|
-
qq.extend(this._options, o);
|
905
|
-
|
902
|
+
qq.extend(this._options, o);
|
903
|
+
|
906
904
|
this._queue = [];
|
907
905
|
// params for files in queue
|
908
906
|
this._params = [];
|
909
907
|
};
|
910
908
|
qq.UploadHandlerAbstract.prototype = {
|
911
909
|
log: function(str){
|
912
|
-
if (this._options.debug && window.console) console.log('[uploader] ' + str);
|
910
|
+
if (this._options.debug && window.console) console.log('[uploader] ' + str);
|
913
911
|
},
|
914
912
|
/**
|
915
913
|
* Adds file or file input to the queue
|
916
914
|
* @returns id
|
917
|
-
**/
|
915
|
+
**/
|
918
916
|
add: function(file){},
|
919
917
|
/**
|
920
918
|
* Sends the file identified by id and additional query params to the server
|
@@ -922,12 +920,12 @@ qq.UploadHandlerAbstract.prototype = {
|
|
922
920
|
upload: function(id, params){
|
923
921
|
var len = this._queue.push(id);
|
924
922
|
|
925
|
-
var copy = {};
|
923
|
+
var copy = {};
|
926
924
|
qq.extend(copy, params);
|
927
|
-
this._params[id] = copy;
|
928
|
-
|
925
|
+
this._params[id] = copy;
|
926
|
+
|
929
927
|
// if too many active uploads, wait...
|
930
|
-
if (len <= this._options.maxConnections){
|
928
|
+
if (len <= this._options.maxConnections){
|
931
929
|
this._upload(id, this._params[id]);
|
932
930
|
}
|
933
931
|
},
|
@@ -953,7 +951,7 @@ qq.UploadHandlerAbstract.prototype = {
|
|
953
951
|
getName: function(id){},
|
954
952
|
/**
|
955
953
|
* Returns size of the file identified by id
|
956
|
-
*/
|
954
|
+
*/
|
957
955
|
getSize: function(id){},
|
958
956
|
/**
|
959
957
|
* Returns id of files being uploaded or
|
@@ -969,21 +967,21 @@ qq.UploadHandlerAbstract.prototype = {
|
|
969
967
|
/**
|
970
968
|
* Actual cancel method
|
971
969
|
*/
|
972
|
-
_cancel: function(id){},
|
970
|
+
_cancel: function(id){},
|
973
971
|
/**
|
974
972
|
* Removes element from queue, starts upload of next
|
975
973
|
*/
|
976
974
|
_dequeue: function(id){
|
977
975
|
var i = qq.indexOf(this._queue, id);
|
978
976
|
this._queue.splice(i, 1);
|
979
|
-
|
977
|
+
|
980
978
|
var max = this._options.maxConnections;
|
981
|
-
|
979
|
+
|
982
980
|
if (this._queue.length >= max && i < max){
|
983
981
|
var nextId = this._queue[max-1];
|
984
982
|
this._upload(nextId, this._params[nextId]);
|
985
983
|
}
|
986
|
-
}
|
984
|
+
}
|
987
985
|
};
|
988
986
|
|
989
987
|
/**
|
@@ -992,7 +990,7 @@ qq.UploadHandlerAbstract.prototype = {
|
|
992
990
|
*/
|
993
991
|
qq.UploadHandlerForm = function(o){
|
994
992
|
qq.UploadHandlerAbstract.apply(this, arguments);
|
995
|
-
|
993
|
+
|
996
994
|
this._inputs = {};
|
997
995
|
};
|
998
996
|
// @inherits qq.UploadHandlerAbstract
|
@@ -1001,25 +999,25 @@ qq.extend(qq.UploadHandlerForm.prototype, qq.UploadHandlerAbstract.prototype);
|
|
1001
999
|
qq.extend(qq.UploadHandlerForm.prototype, {
|
1002
1000
|
add: function(fileInput){
|
1003
1001
|
fileInput.setAttribute('name', this._options.fieldName);
|
1004
|
-
var id = 'qq-upload-handler-iframe' + qq.getUniqueId();
|
1005
|
-
|
1002
|
+
var id = 'qq-upload-handler-iframe' + qq.getUniqueId();
|
1003
|
+
|
1006
1004
|
this._inputs[id] = fileInput;
|
1007
|
-
|
1005
|
+
|
1008
1006
|
// remove file input from DOM
|
1009
1007
|
if (fileInput.parentNode){
|
1010
1008
|
qq.remove(fileInput);
|
1011
1009
|
}
|
1012
|
-
|
1010
|
+
|
1013
1011
|
return id;
|
1014
1012
|
},
|
1015
1013
|
getName: function(id){
|
1016
1014
|
// get input value and remove path to normalize
|
1017
1015
|
return this._inputs[id].value.replace(/.*(\/|\\)/, "");
|
1018
|
-
},
|
1016
|
+
},
|
1019
1017
|
_cancel: function(id){
|
1020
1018
|
this._options.onCancel(id, this.getName(id));
|
1021
|
-
|
1022
|
-
delete this._inputs[id];
|
1019
|
+
|
1020
|
+
delete this._inputs[id];
|
1023
1021
|
|
1024
1022
|
var iframe = document.getElementById(id);
|
1025
1023
|
if (iframe){
|
@@ -1030,29 +1028,29 @@ qq.extend(qq.UploadHandlerForm.prototype, {
|
|
1030
1028
|
|
1031
1029
|
qq.remove(iframe);
|
1032
1030
|
}
|
1033
|
-
},
|
1034
|
-
_upload: function(id, params){
|
1031
|
+
},
|
1032
|
+
_upload: function(id, params){
|
1035
1033
|
var input = this._inputs[id];
|
1036
|
-
|
1034
|
+
|
1037
1035
|
if (!input){
|
1038
1036
|
throw new Error('file with passed id was not added, or already uploaded or cancelled');
|
1039
|
-
}
|
1037
|
+
}
|
1040
1038
|
|
1041
1039
|
var fileName = this.getName(id);
|
1042
|
-
|
1040
|
+
|
1043
1041
|
var iframe = this._createIframe(id);
|
1044
1042
|
var form = this._createForm(iframe, params);
|
1045
1043
|
form.appendChild(input);
|
1046
1044
|
|
1047
1045
|
var self = this;
|
1048
|
-
this._attachLoadEvent(iframe, function(){
|
1046
|
+
this._attachLoadEvent(iframe, function(){
|
1049
1047
|
self.log('iframe loaded');
|
1050
|
-
|
1048
|
+
|
1051
1049
|
var response = self._getIframeContentJSON(iframe);
|
1052
1050
|
|
1053
1051
|
self._options.onComplete(id, fileName, response);
|
1054
1052
|
self._dequeue(id);
|
1055
|
-
|
1053
|
+
|
1056
1054
|
delete self._inputs[id];
|
1057
1055
|
// timeout added to fix busy state in FF3.6
|
1058
1056
|
setTimeout(function(){
|
@@ -1060,11 +1058,11 @@ qq.extend(qq.UploadHandlerForm.prototype, {
|
|
1060
1058
|
}, 1);
|
1061
1059
|
});
|
1062
1060
|
|
1063
|
-
form.submit();
|
1064
|
-
qq.remove(form);
|
1065
|
-
|
1061
|
+
form.submit();
|
1062
|
+
qq.remove(form);
|
1063
|
+
|
1066
1064
|
return id;
|
1067
|
-
},
|
1065
|
+
},
|
1068
1066
|
_attachLoadEvent: function(iframe, callback){
|
1069
1067
|
qq.attach(iframe, 'load', function(){
|
1070
1068
|
// when we remove iframe from dom
|
@@ -1095,15 +1093,15 @@ qq.extend(qq.UploadHandlerForm.prototype, {
|
|
1095
1093
|
// iframe.contentWindow.document - for IE<7
|
1096
1094
|
var doc = iframe.contentDocument ? iframe.contentDocument: iframe.contentWindow.document,
|
1097
1095
|
response;
|
1098
|
-
|
1096
|
+
|
1099
1097
|
this.log("converting iframe's innerHTML to JSON");
|
1100
1098
|
this.log("innerHTML = " + doc.body.innerHTML);
|
1101
|
-
|
1099
|
+
|
1102
1100
|
try {
|
1103
1101
|
response = eval("(" + doc.body.innerHTML + ")");
|
1104
1102
|
} catch(err){
|
1105
1103
|
response = {};
|
1106
|
-
}
|
1104
|
+
}
|
1107
1105
|
|
1108
1106
|
return response;
|
1109
1107
|
},
|
@@ -1139,7 +1137,7 @@ qq.extend(qq.UploadHandlerForm.prototype, {
|
|
1139
1137
|
var form = qq.toElement('<form enctype="multipart/form-data"></form>');
|
1140
1138
|
|
1141
1139
|
var queryString = qq.obj2url(params, this._options.action);
|
1142
|
-
|
1140
|
+
|
1143
1141
|
form.setAttribute('method', this._options.method);
|
1144
1142
|
form.setAttribute('action', queryString);
|
1145
1143
|
form.setAttribute('target', iframe.name);
|
@@ -1149,10 +1147,10 @@ qq.extend(qq.UploadHandlerForm.prototype, {
|
|
1149
1147
|
var token = $('meta[name="csrf-token"]').attr('content');
|
1150
1148
|
var param = $('meta[name="csrf-param"]').attr('content');
|
1151
1149
|
var input = qq.toElement('<input type="hidden" />');
|
1152
|
-
|
1150
|
+
|
1153
1151
|
input.setAttribute('name', param);
|
1154
1152
|
input.setAttribute('value', token);
|
1155
|
-
|
1153
|
+
|
1156
1154
|
form.appendChild(input);
|
1157
1155
|
document.body.appendChild(form);
|
1158
1156
|
|
@@ -1169,20 +1167,20 @@ qq.UploadHandlerXhr = function(o){
|
|
1169
1167
|
|
1170
1168
|
this._files = [];
|
1171
1169
|
this._xhrs = [];
|
1172
|
-
|
1173
|
-
// current loaded size in bytes for each file
|
1170
|
+
|
1171
|
+
// current loaded size in bytes for each file
|
1174
1172
|
this._loaded = [];
|
1175
1173
|
};
|
1176
1174
|
|
1177
1175
|
// static method
|
1178
1176
|
qq.UploadHandlerXhr.isSupported = function(){
|
1179
1177
|
var input = document.createElement('input');
|
1180
|
-
input.type = 'file';
|
1181
|
-
|
1178
|
+
input.type = 'file';
|
1179
|
+
|
1182
1180
|
return (
|
1183
1181
|
'multiple' in input &&
|
1184
1182
|
typeof File != "undefined" &&
|
1185
|
-
typeof (new XMLHttpRequest()).upload != "undefined" );
|
1183
|
+
typeof (new XMLHttpRequest()).upload != "undefined" );
|
1186
1184
|
};
|
1187
1185
|
|
1188
1186
|
// @inherits qq.UploadHandlerAbstract
|
@@ -1192,43 +1190,43 @@ qq.extend(qq.UploadHandlerXhr.prototype, {
|
|
1192
1190
|
/**
|
1193
1191
|
* Adds file to the queue
|
1194
1192
|
* Returns id to use with upload, cancel
|
1195
|
-
**/
|
1193
|
+
**/
|
1196
1194
|
add: function(file){
|
1197
1195
|
if (!(file instanceof File)){
|
1198
1196
|
throw new Error('Passed obj in not a File (in qq.UploadHandlerXhr)');
|
1199
1197
|
}
|
1200
|
-
|
1201
|
-
return this._files.push(file) - 1;
|
1198
|
+
|
1199
|
+
return this._files.push(file) - 1;
|
1202
1200
|
},
|
1203
|
-
getName: function(id){
|
1201
|
+
getName: function(id){
|
1204
1202
|
var file = this._files[id];
|
1205
1203
|
// fix missing name in Safari 4
|
1206
|
-
return file.fileName != null ? file.fileName : file.name;
|
1204
|
+
return file.fileName != null ? file.fileName : file.name;
|
1207
1205
|
},
|
1208
1206
|
getSize: function(id){
|
1209
1207
|
var file = this._files[id];
|
1210
1208
|
return file.fileSize != null ? file.fileSize : file.size;
|
1211
|
-
},
|
1209
|
+
},
|
1212
1210
|
/**
|
1213
|
-
* Returns uploaded bytes for file identified by id
|
1214
|
-
*/
|
1211
|
+
* Returns uploaded bytes for file identified by id
|
1212
|
+
*/
|
1215
1213
|
getLoaded: function(id){
|
1216
|
-
return this._loaded[id] || 0;
|
1214
|
+
return this._loaded[id] || 0;
|
1217
1215
|
},
|
1218
1216
|
/**
|
1219
1217
|
* Sends the file identified by id and additional query params to the server
|
1220
1218
|
* @param {Object} params name-value string pairs
|
1221
|
-
*/
|
1219
|
+
*/
|
1222
1220
|
_upload: function(id, params){
|
1223
1221
|
var file = this._files[id],
|
1224
1222
|
name = this.getName(id),
|
1225
1223
|
size = this.getSize(id);
|
1226
|
-
|
1224
|
+
|
1227
1225
|
this._loaded[id] = 0;
|
1228
|
-
|
1226
|
+
|
1229
1227
|
var xhr = this._xhrs[id] = new XMLHttpRequest();
|
1230
1228
|
var self = this;
|
1231
|
-
|
1229
|
+
|
1232
1230
|
xhr.upload.onprogress = function(e){
|
1233
1231
|
if (e.lengthComputable){
|
1234
1232
|
self._loaded[id] = e.loaded;
|
@@ -1236,16 +1234,15 @@ qq.extend(qq.UploadHandlerXhr.prototype, {
|
|
1236
1234
|
}
|
1237
1235
|
};
|
1238
1236
|
|
1239
|
-
xhr.onreadystatechange = function(){
|
1237
|
+
xhr.onreadystatechange = function(){
|
1240
1238
|
if (xhr.readyState == 4){
|
1241
|
-
self._onComplete(id, xhr);
|
1239
|
+
self._onComplete(id, xhr);
|
1242
1240
|
}
|
1243
1241
|
};
|
1244
1242
|
|
1245
1243
|
// build query string
|
1246
1244
|
params = params || {};
|
1247
1245
|
params[this._options.fieldName] = name;
|
1248
|
-
console.log("params")
|
1249
1246
|
var queryString = qq.obj2url(params, this._options.action);
|
1250
1247
|
|
1251
1248
|
xhr.open(this._options.method, queryString, true);
|
@@ -1256,50 +1253,49 @@ qq.extend(qq.UploadHandlerXhr.prototype, {
|
|
1256
1253
|
xhr.setRequestHeader("Content-Type", "application/octet-stream");
|
1257
1254
|
|
1258
1255
|
// Rails CSRFProtection
|
1259
|
-
if ($.rails) $.rails.CSRFProtection(xhr);
|
1256
|
+
if ($.rails) $.rails.CSRFProtection(xhr);
|
1260
1257
|
|
1261
1258
|
xhr.send(file);
|
1262
1259
|
},
|
1263
1260
|
_onComplete: function(id, xhr){
|
1264
1261
|
// the request was aborted/cancelled
|
1265
1262
|
if (!this._files[id]) return;
|
1266
|
-
|
1263
|
+
|
1267
1264
|
var name = this.getName(id);
|
1268
1265
|
var size = this.getSize(id);
|
1269
|
-
|
1266
|
+
|
1270
1267
|
this._options.onProgress(id, name, size, size);
|
1271
|
-
|
1268
|
+
|
1272
1269
|
if ([200, 201].indexOf( xhr.status ) > -1){
|
1273
1270
|
this.log("xhr - server response received");
|
1274
1271
|
this.log("responseText = " + xhr.responseText);
|
1275
|
-
|
1272
|
+
|
1276
1273
|
var response;
|
1277
|
-
|
1274
|
+
|
1278
1275
|
try {
|
1279
1276
|
response = eval("(" + xhr.responseText + ")");
|
1280
1277
|
} catch(err){
|
1281
1278
|
response = {};
|
1282
1279
|
}
|
1283
|
-
|
1284
|
-
console.log(id, name, response)
|
1280
|
+
|
1285
1281
|
this._options.onComplete(id, name, response);
|
1286
|
-
|
1287
|
-
} else {
|
1282
|
+
|
1283
|
+
} else {
|
1288
1284
|
this._options.onComplete(id, name, {});
|
1289
1285
|
}
|
1290
|
-
|
1286
|
+
|
1291
1287
|
this._files[id] = null;
|
1292
|
-
this._xhrs[id] = null;
|
1293
|
-
this._dequeue(id);
|
1288
|
+
this._xhrs[id] = null;
|
1289
|
+
this._dequeue(id);
|
1294
1290
|
},
|
1295
1291
|
_cancel: function(id){
|
1296
1292
|
this._options.onCancel(id, this.getName(id));
|
1297
|
-
|
1293
|
+
|
1298
1294
|
this._files[id] = null;
|
1299
|
-
|
1295
|
+
|
1300
1296
|
if (this._xhrs[id]){
|
1301
1297
|
this._xhrs[id].abort();
|
1302
|
-
this._xhrs[id] = null;
|
1298
|
+
this._xhrs[id] = null;
|
1303
1299
|
}
|
1304
1300
|
}
|
1305
1301
|
});
|