typo 5.1.3 → 5.1.98
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +1 -0
- data/MAINTAINERS +5 -1
- data/README +3 -10
- data/app/apis/meta_weblog_service.rb +1 -1
- data/app/controllers/accounts_controller.rb +20 -9
- data/app/controllers/admin/base_controller.rb +21 -1
- data/app/controllers/admin/blacklist_controller.rb +6 -15
- data/app/controllers/admin/cache_controller.rb +2 -6
- data/app/controllers/admin/categories_controller.rb +32 -26
- data/app/controllers/admin/content_controller.rb +40 -54
- data/app/controllers/admin/dashboard_controller.rb +58 -5
- data/app/controllers/admin/feedback_controller.rb +88 -17
- data/app/controllers/admin/pages_controller.rb +9 -30
- data/app/controllers/admin/profiles_controller.rb +7 -10
- data/app/controllers/admin/resources_controller.rb +13 -12
- data/app/controllers/admin/settings_controller.rb +9 -42
- data/app/controllers/admin/sidebar_controller.rb +21 -8
- data/app/controllers/admin/tags_controller.rb +7 -13
- data/app/controllers/admin/textfilters_controller.rb +1 -99
- data/app/controllers/admin/themes_controller.rb +8 -5
- data/app/controllers/admin/users_controller.rb +13 -11
- data/app/controllers/application.rb +1 -0
- data/app/controllers/articles_controller.rb +64 -16
- data/app/controllers/backend_controller.rb +8 -2
- data/app/controllers/grouping_controller.rb +16 -10
- data/app/controllers/redirect_controller.rb +2 -2
- data/app/controllers/users_controller.rb +4 -0
- data/app/controllers/xml_controller.rb +3 -1
- data/app/helpers/admin/base_helper.rb +60 -113
- data/app/helpers/admin/content_helper.rb +19 -1
- data/app/helpers/admin/feedback_helper.rb +0 -31
- data/app/helpers/admin/pages_helper.rb +0 -20
- data/app/helpers/admin/settings_helper.rb +5 -0
- data/app/helpers/application_helper.rb +43 -27
- data/app/helpers/authors_helper.rb +1 -3
- data/app/helpers/content_helper.rb +1 -18
- data/app/helpers/sidebar_helper.rb +12 -0
- data/app/helpers/theme_helper.rb +0 -20
- data/app/helpers/xml_helper.rb +1 -9
- data/app/models/article.rb +73 -9
- data/app/models/blog.rb +24 -3
- data/app/models/blog_sweeper.rb +4 -13
- data/app/models/category.rb +1 -0
- data/app/models/content.rb +45 -4
- data/app/models/feedback/states.rb +21 -2
- data/app/models/feedback.rb +2 -0
- data/app/models/page.rb +7 -0
- data/app/models/page_cache.rb +1 -1
- data/app/models/profile.rb +2 -0
- data/app/models/tag.rb +3 -1
- data/app/models/theme.rb +1 -1
- data/app/models/user.rb +35 -6
- data/app/views/accounts/login.html.erb +7 -9
- data/app/views/accounts/signup.html.erb +1 -1
- data/app/views/admin/base/_recent_comments.html.erb +3 -3
- data/app/views/admin/base/_recent_trackbacks.html.erb +3 -3
- data/app/views/admin/blacklist/_blacklist_patterns.html.erb +2 -5
- data/app/views/admin/blacklist/_quick_post.html.erb +1 -1
- data/app/views/admin/blacklist/edit.html.erb +2 -3
- data/app/views/admin/blacklist/index.html.erb +2 -2
- data/app/views/admin/categories/_categories.html.erb +8 -10
- data/app/views/admin/categories/_form.html.erb +12 -3
- data/app/views/admin/categories/index.html.erb +1 -5
- data/app/views/admin/categories/new.html.erb +9 -0
- data/app/views/admin/content/_article_list.html.erb +16 -0
- data/app/views/admin/content/_drafts.html.erb +3 -3
- data/app/views/admin/content/_form.html.erb +29 -53
- data/app/views/admin/content/index.html.erb +49 -9
- data/app/views/admin/content/new.html.erb +1 -1
- data/app/views/admin/dashboard/_comments.html.erb +1 -3
- data/app/views/admin/dashboard/_inbound.html.erb +19 -0
- data/app/views/admin/dashboard/_overview.html.erb +7 -2
- data/app/views/admin/dashboard/_sysinfo.html.erb +5 -5
- data/app/views/admin/dashboard/_typo_dev.html.erb +21 -0
- data/app/views/admin/dashboard/_welcome.html.erb +1 -1
- data/app/views/admin/dashboard/index.html.erb +14 -17
- data/app/views/admin/feedback/_button.html.erb +5 -4
- data/app/views/admin/{comments → feedback}/_form.html.erb +1 -0
- data/app/views/admin/feedback/_item.html.erb +3 -5
- data/app/views/admin/feedback/article.html.erb +33 -0
- data/app/views/admin/feedback/edit.html.erb +10 -0
- data/app/views/admin/feedback/index.html.erb +21 -24
- data/app/views/admin/pages/_form.html.erb +20 -28
- data/app/views/admin/pages/_pages.html.erb +14 -25
- data/app/views/admin/resources/_metadata_edit.html.erb +1 -1
- data/app/views/admin/resources/_resources.html.erb +8 -5
- data/app/views/admin/resources/index.html.erb +1 -3
- data/app/views/admin/settings/_submit.html.erb +2 -2
- data/app/views/admin/settings/feedback.html.erb +86 -49
- data/app/views/admin/settings/index.html.erb +54 -58
- data/app/views/admin/settings/read.html.erb +2 -1
- data/app/views/admin/settings/seo.html.erb +46 -0
- data/app/views/admin/settings/update_database.html.erb +27 -29
- data/app/views/admin/settings/write.html.erb +41 -11
- data/app/views/admin/shared/_edit.html.erb +2 -1
- data/app/views/admin/sidebar/index.html.erb +4 -4
- data/app/views/admin/sidebar/set_active.rjs +1 -1
- data/app/views/admin/tags/_tags.html.erb +7 -8
- data/app/views/admin/tags/edit.html.erb +2 -2
- data/app/views/admin/tags/index.html.erb +1 -3
- data/app/views/admin/users/_form.html.erb +14 -3
- data/app/views/admin/users/edit.html.erb +1 -1
- data/app/views/admin/users/index.html.erb +16 -16
- data/app/views/admin/users/new.html.erb +1 -1
- data/app/views/articles/_comment_failed.html.erb +1 -0
- data/app/views/articles/_rss20_feed.rss.builder +1 -1
- data/app/views/articles/groupings.html.erb +4 -3
- data/app/views/articles/index.html.erb +1 -3
- data/app/views/articles/search.html.erb +8 -0
- data/app/views/layouts/accounts.html.erb +2 -3
- data/app/views/layouts/administration.html.erb +44 -40
- data/app/views/shared/_loginform.html.erb +9 -3
- data/app/views/shared/_search.html.erb +3 -8
- data/config/boot.rb +96 -32
- data/config/environment.rb +14 -7
- data/config/environments/development.rb +2 -0
- data/config/initializers/access_rules.rb +41 -48
- data/config/initializers/inflector.rb +1 -0
- data/config/routes.rb +11 -21
- data/db/migrate/001_initial_schema.rb +0 -1
- data/db/migrate/003_add_article_user_id.rb +11 -0
- data/db/migrate/020_superclass_articles.rb +4 -3
- data/db/migrate/021_superclass_comments.rb +2 -2
- data/db/migrate/022_superclass_trackbacks.rb +2 -1
- data/db/migrate/028_rename_redirect_to.rb +5 -1
- data/db/migrate/057_add_categorization_model.rb +12 -6
- data/db/migrate/072_add_remember_token.rb +9 -0
- data/db/migrate/073_add_meta_and_subcategories.rb +13 -0
- data/db/migrate/074_add_remember_token_expires_at.rb +9 -0
- data/db/migrate/075_move_editor_to_user.rb +20 -0
- data/db/migrate/076_fix_users_empty_email.rb +15 -0
- data/db/migrate/077_fix_userless_articles.rb +20 -0
- data/db/schema.rb +38 -38
- data/doc/typo-5.2-release-notes.txt +52 -0
- data/lang/fr_FR.rb +35 -15
- data/lang/he_IL.rb +715 -0
- data/lib/tasks/release.rake +7 -7
- data/lib/tasks/rspec.rake +142 -0
- data/lib/text_filter_plugin.rb +5 -0
- data/lib/typo_version.rb +1 -1
- data/public/images/admin/typologo.gif +0 -0
- data/public/javascripts/administration.js +12 -0
- data/public/javascripts/controls.js +1 -3
- data/public/javascripts/dragdrop.js +1 -3
- data/public/javascripts/effects.js +5 -7
- data/public/javascripts/fckcustom.js +9 -8
- data/public/javascripts/fckeditor/fckconfig.js +2 -2
- data/public/javascripts/fckeditor/fckeditor.js +1 -1
- data/public/javascripts/prototype.js +317 -167
- data/public/javascripts/quicktags.js +511 -0
- data/public/robots.txt +16 -1
- data/public/sources/javascripts/administration.js +12 -0
- data/public/sources/javascripts/application.js +2 -0
- data/public/sources/javascripts/codecollapse.js +8 -0
- data/public/sources/javascripts/controls.js +963 -0
- data/public/sources/javascripts/cookies.js +60 -0
- data/public/sources/javascripts/dragdrop.js +972 -0
- data/public/sources/javascripts/effects.js +1120 -0
- data/public/sources/javascripts/fckcustom.js +28 -0
- data/public/sources/javascripts/lang/default.js +21 -0
- data/public/sources/javascripts/lang/en_US.js +21 -0
- data/public/sources/javascripts/lang/fr_FR.js +21 -0
- data/public/sources/javascripts/lightbox.js +202 -0
- data/public/sources/javascripts/prototype.js +4320 -0
- data/public/sources/javascripts/quicktags.js +511 -0
- data/public/sources/javascripts/scriptaculous.js +58 -0
- data/public/sources/javascripts/slider.js +258 -0
- data/public/sources/javascripts/typo.js +136 -0
- data/public/sources/stylesheets/administration.css +955 -0
- data/public/sources/stylesheets/administration_rtl.css +1026 -0
- data/public/sources/stylesheets/codecollapse.css +3 -0
- data/public/sources/stylesheets/coderay.css +126 -0
- data/public/sources/stylesheets/lightbox.css +62 -0
- data/public/sources/stylesheets/rss.css +54 -0
- data/public/sources/stylesheets/textmate/dawn.css +209 -0
- data/public/sources/stylesheets/textmate/iplastic.css +142 -0
- data/public/sources/stylesheets/textmate/space_cadet.css +99 -0
- data/public/sources/stylesheets/textmate/textmate.css +48 -0
- data/public/sources/stylesheets/textmate/twilight.css +227 -0
- data/public/sources/stylesheets/user-styles.css +22 -0
- data/public/stylesheets/administration.css +146 -214
- data/public/stylesheets/administration_rtl.css +1026 -0
- data/public/stylesheets/coderay.css +128 -0
- data/script/autospec +5 -0
- data/script/dbconsole +3 -0
- data/script/performance/request +3 -0
- data/script/spec_server +18 -4
- data/spec/controllers/accounts_controller_spec.rb +24 -11
- data/spec/controllers/admin/blacklist_controller_spec.rb +4 -4
- data/spec/controllers/admin/cache_controller_spec.rb +32 -0
- data/spec/controllers/admin/categories_controller_spec.rb +8 -16
- data/spec/controllers/admin/content_controller_spec.rb +327 -171
- data/spec/controllers/admin/feedback_controller_spec.rb +278 -26
- data/spec/controllers/admin/pages_controller_spec.rb +0 -6
- data/spec/controllers/admin/resources_controller_spec.rb +3 -6
- data/spec/controllers/admin/settings_controller_spec.rb +21 -1
- data/spec/controllers/admin/tags_controller_spec.rb +35 -0
- data/spec/controllers/admin/textfilters_controller_spec.rb +10 -9
- data/spec/controllers/admin/users_controller_spec.rb +17 -18
- data/spec/controllers/articles_controller_spec.rb +4 -1
- data/spec/controllers/authors_controller_spec.rb +3 -6
- data/spec/controllers/backend_controller_spec.rb +26 -3
- data/spec/controllers/categories_controller_spec.rb +3 -6
- data/spec/controllers/comments_controller_spec.rb +4 -3
- data/spec/controllers/redirect_controller_spec.rb +5 -5
- data/spec/controllers/routes/articles_routing_spec.rb +31 -0
- data/spec/controllers/tags_controller_spec.rb +3 -6
- data/spec/controllers/textfilter_controller_spec.rb +37 -21
- data/spec/controllers/xml_controller_spec.rb +4 -1
- data/spec/helpers/application_helper_spec.rb +25 -0
- data/spec/helpers/content_helper_spec.rb +2 -0
- data/spec/lib/text_filter_plugin_spec.rb +15 -0
- data/spec/models/article_closing_spec.rb +4 -0
- data/spec/models/article_spec.rb +72 -3
- data/spec/models/blog_spec.rb +12 -0
- data/spec/models/comment_spec.rb +155 -127
- data/spec/models/metafragment_spec.rb +12 -0
- data/spec/models/resource_spec.rb +1 -0
- data/spec/models/tag_spec.rb +2 -2
- data/spec/models/theme_spec.rb +2 -2
- data/spec/models/user_spec.rb +14 -0
- data/spec/spec_helper.rb +1 -0
- data/spec/views/articles/index_spec.rb +57 -0
- data/test/fixtures/contents.yml +18 -0
- data/test/fixtures/feedback.yml +27 -0
- data/test/fixtures/profiles.yml +4 -0
- data/test/mocks/themes/typographic/views/articles/_article.html.erb +1 -1
- data/test/mocks/themes/typographic/views/articles/index.html.erb +1 -1
- data/themes/dirtylicious/layouts/default.html.erb +1 -1
- data/themes/dirtylicious/views/articles/index.html.erb +1 -3
- data/themes/scribbish/views/articles/index.html.erb +1 -3
- data/themes/standard_issue/views/articles/_article.html.erb +1 -1
- data/themes/standard_issue/views/articles/index.html.erb +1 -3
- data/themes/typographic/views/articles/_article.html.erb +1 -1
- data/themes/typographic/views/articles/index.html.erb +1 -3
- data/vendor/actionwebservice/CHANGELOG +63 -8
- data/vendor/actionwebservice/README +17 -0
- data/vendor/actionwebservice/Rakefile +12 -11
- data/vendor/actionwebservice/actionwebservice.gemspec +26 -0
- data/vendor/actionwebservice/generators/web_service/USAGE +28 -0
- data/vendor/actionwebservice/generators/web_service/templates/api_definition.rb +5 -0
- data/vendor/actionwebservice/generators/web_service/templates/controller.rb +8 -0
- data/vendor/actionwebservice/generators/web_service/templates/functional_test.rb +19 -0
- data/vendor/actionwebservice/generators/web_service/web_service_generator.rb +29 -0
- data/vendor/actionwebservice/install.rb +1 -1
- data/vendor/actionwebservice/lib/action_web_service/api.rb +1 -1
- data/vendor/actionwebservice/lib/action_web_service/casting.rb +7 -1
- data/vendor/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb +2 -2
- data/vendor/actionwebservice/lib/action_web_service/protocol/soap_protocol/marshaler.rb +7 -0
- data/vendor/actionwebservice/lib/action_web_service/scaffolding.rb +8 -8
- data/vendor/actionwebservice/lib/action_web_service/templates/scaffolds/{layout.erb → layout.html.erb} +0 -0
- data/vendor/actionwebservice/lib/action_web_service/templates/scaffolds/{methods.erb → methods.html.erb} +0 -0
- data/vendor/actionwebservice/lib/action_web_service/templates/scaffolds/{parameters.erb → parameters.html.erb} +0 -0
- data/vendor/actionwebservice/lib/action_web_service/templates/scaffolds/{result.erb → result.html.erb} +0 -0
- data/vendor/actionwebservice/lib/action_web_service/version.rb +3 -3
- data/vendor/actionwebservice/lib/action_web_service.rb +3 -3
- data/vendor/actionwebservice/test/abstract_client.rb +1 -1
- data/vendor/actionwebservice/test/abstract_dispatcher.rb +0 -4
- data/vendor/actionwebservice/test/abstract_unit.rb +6 -18
- data/vendor/actionwebservice/test/client_xmlrpc_test.rb +0 -1
- data/vendor/actionwebservice/test/gencov +0 -0
- data/vendor/actionwebservice/test/run +0 -0
- data/vendor/actionwebservice/test/scaffolded_controller_test.rb +5 -5
- data/vendor/gems/coderay-0.8.260/.specification +114 -0
- data/vendor/gems/coderay-0.8.260/FOLDERS +53 -0
- data/vendor/gems/coderay-0.8.260/LICENSE +504 -0
- data/vendor/gems/coderay-0.8.260/README +128 -0
- data/vendor/gems/coderay-0.8.260/bin/coderay +82 -0
- data/vendor/gems/coderay-0.8.260/bin/coderay_stylesheet +4 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/duo.rb +87 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoder.rb +182 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/_map.rb +9 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/count.rb +21 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/debug.rb +49 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/div.rb +20 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/html/css.rb +70 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/html/numerization.rb +124 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/html/output.rb +197 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/html.rb +287 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/null.rb +26 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/page.rb +21 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/span.rb +20 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/statistic.rb +77 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/text.rb +32 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/tokens.rb +44 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/xml.rb +70 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/encoders/yaml.rb +22 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/for_redcloth.rb +72 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/helpers/file_type.rb +211 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/helpers/gzip_simple.rb +123 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/helpers/plugin.rb +333 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/helpers/word_list.rb +123 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanner.rb +255 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/_map.rb +15 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/c.rb +165 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/css.rb +181 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/debug.rb +61 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/delphi.rb +150 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/diff.rb +104 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/html.rb +177 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/java/builtin_types.rb +419 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/java.rb +179 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/java_script.rb +187 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/json.rb +106 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/nitro_xhtml.rb +134 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/plaintext.rb +18 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/rhtml.rb +73 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/ruby/patterns.rb +226 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/ruby.rb +381 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/scheme.rb +142 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/sql.Keith.rb +143 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/sql.rb +154 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/scanners/xml.rb +19 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/style.rb +20 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/styles/_map.rb +7 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/styles/cycnus.rb +146 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/styles/murphy.rb +132 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/token_classes.rb +82 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay/tokens.rb +387 -0
- data/vendor/gems/coderay-0.8.260/lib/coderay.rb +321 -0
- data/vendor/gems/coderay-0.8.260/lib/term/ansicolor.rb +220 -0
- data/vendor/plugins/acts_as_tree/README +26 -0
- data/vendor/plugins/{classic_pagination → acts_as_tree}/Rakefile +3 -3
- data/vendor/plugins/acts_as_tree/init.rb +1 -0
- data/vendor/plugins/acts_as_tree/lib/active_record/acts/tree.rb +96 -0
- data/vendor/{actionwebservice/lib/action_web_service/templates/scaffolds/layout.rhtml → plugins/acts_as_tree/test/abstract_unit.rb} +0 -0
- data/vendor/plugins/acts_as_tree/test/acts_as_tree_test.rb +219 -0
- data/vendor/{actionwebservice/lib/action_web_service/templates/scaffolds/methods.rhtml → plugins/acts_as_tree/test/database.yml} +0 -0
- data/vendor/{actionwebservice/lib/action_web_service/templates/scaffolds/parameters.rhtml → plugins/acts_as_tree/test/fixtures/mixin.rb} +0 -0
- data/vendor/{actionwebservice/lib/action_web_service/templates/scaffolds/result.rhtml → plugins/acts_as_tree/test/fixtures/mixins.yml} +0 -0
- data/vendor/plugins/{rspec_on_rails/generators/rspec/templates/previous_failures.txt → acts_as_tree/test/schema.rb} +0 -0
- data/vendor/plugins/expiring_action_cache/lib/metafragment.rb +1 -1
- data/vendor/plugins/fckeditor/lib/fckeditor.rb +1 -1
- data/vendor/plugins/livesearch_sidebar/init.rb +4 -0
- data/vendor/plugins/livesearch_sidebar/lib/livesearch_sidebar.rb +5 -0
- data/vendor/plugins/livesearch_sidebar/views/content.rhtml +15 -0
- data/vendor/plugins/localization/bin/make_language.rb +78 -0
- data/vendor/plugins/localization/lib/localization.rb +14 -0
- data/vendor/plugins/rspec/.autotest +1 -0
- data/vendor/plugins/rspec/{CHANGES → History.txt} +215 -62
- data/vendor/plugins/rspec/{MIT-LICENSE → License.txt} +3 -1
- data/vendor/plugins/rspec/Manifest.txt +403 -0
- data/vendor/plugins/rspec/README.txt +39 -0
- data/vendor/plugins/rspec/Rakefile +39 -229
- data/vendor/plugins/rspec/TODO.txt +10 -0
- data/vendor/plugins/rspec/bin/autospec +4 -0
- data/vendor/plugins/rspec/bin/spec +1 -1
- data/vendor/plugins/rspec/examples/pure/autogenerated_docstrings_example.rb +4 -4
- data/vendor/plugins/rspec/examples/pure/partial_mock_example.rb +1 -0
- data/vendor/plugins/rspec/examples/pure/shared_example_group_example.rb +2 -2
- data/vendor/plugins/rspec/examples/pure/yielding_example.rb +33 -0
- data/vendor/plugins/rspec/examples/stories/calculator.rb +1 -1
- data/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/everything.rb +1 -1
- data/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/CellsWithMoreThanThreeNeighboursDie.story +17 -17
- data/vendor/plugins/rspec/lib/autotest/discover.rb +1 -1
- data/vendor/plugins/rspec/lib/autotest/rspec.rb +10 -38
- data/vendor/plugins/rspec/lib/spec/adapters/ruby_engine/mri.rb +8 -0
- data/vendor/plugins/rspec/lib/spec/adapters/ruby_engine/rubinius.rb +8 -0
- data/vendor/plugins/rspec/lib/spec/adapters/ruby_engine.rb +26 -0
- data/vendor/plugins/rspec/lib/spec/adapters.rb +1 -0
- data/vendor/plugins/rspec/lib/spec/example/before_and_after_hooks.rb +93 -0
- data/vendor/plugins/rspec/lib/spec/example/configuration.rb +40 -17
- data/vendor/plugins/rspec/lib/spec/example/errors.rb +23 -2
- data/vendor/plugins/rspec/lib/spec/example/example_group.rb +12 -3
- data/vendor/plugins/rspec/lib/spec/example/example_group_factory.rb +41 -22
- data/vendor/plugins/rspec/lib/spec/example/example_group_methods.rb +88 -144
- data/vendor/plugins/rspec/lib/spec/example/example_matcher.rb +2 -0
- data/vendor/plugins/rspec/lib/spec/example/example_methods.rb +19 -20
- data/vendor/plugins/rspec/lib/spec/example/shared_example_group.rb +6 -12
- data/vendor/plugins/rspec/lib/spec/example.rb +1 -1
- data/vendor/plugins/rspec/lib/spec/expectations/differs/default.rb +1 -1
- data/vendor/plugins/rspec/lib/spec/expectations/extensions/object.rb +4 -12
- data/vendor/plugins/rspec/lib/spec/expectations/handler.rb +10 -10
- data/vendor/plugins/rspec/lib/spec/extensions/main.rb +3 -18
- data/vendor/plugins/rspec/lib/spec/extensions/metaclass.rb +7 -0
- data/vendor/plugins/rspec/lib/spec/extensions/object.rb +0 -4
- data/vendor/plugins/rspec/lib/spec/extensions.rb +1 -0
- data/vendor/plugins/rspec/lib/spec/interop/test/unit/testcase.rb +12 -2
- data/vendor/plugins/rspec/lib/spec/matchers/be.rb +18 -21
- data/vendor/plugins/rspec/lib/spec/matchers/be_close.rb +5 -5
- data/vendor/plugins/rspec/lib/spec/matchers/change.rb +45 -41
- data/vendor/plugins/rspec/lib/spec/matchers/eql.rb +6 -6
- data/vendor/plugins/rspec/lib/spec/matchers/equal.rb +6 -6
- data/vendor/plugins/rspec/lib/spec/matchers/exist.rb +10 -5
- data/vendor/plugins/rspec/lib/spec/matchers/has.rb +2 -12
- data/vendor/plugins/rspec/lib/spec/matchers/have.rb +25 -20
- data/vendor/plugins/rspec/lib/spec/matchers/include.rb +12 -5
- data/vendor/plugins/rspec/lib/spec/matchers/match.rb +9 -9
- data/vendor/plugins/rspec/lib/spec/matchers/operator_matcher.rb +25 -19
- data/vendor/plugins/rspec/lib/spec/matchers/raise_error.rb +60 -37
- data/vendor/plugins/rspec/lib/spec/matchers/respond_to.rb +5 -4
- data/vendor/plugins/rspec/lib/spec/matchers/satisfy.rb +5 -5
- data/vendor/plugins/rspec/lib/spec/matchers/simple_matcher.rb +115 -12
- data/vendor/plugins/rspec/lib/spec/matchers/throw_symbol.rb +3 -3
- data/vendor/plugins/rspec/lib/spec/matchers.rb +8 -2
- data/vendor/plugins/rspec/lib/spec/mocks/argument_constraints.rb +165 -0
- data/vendor/plugins/rspec/lib/spec/mocks/argument_expectation.rb +24 -158
- data/vendor/plugins/rspec/lib/spec/mocks/error_generator.rb +1 -1
- data/vendor/plugins/rspec/lib/spec/mocks/extensions.rb +1 -0
- data/vendor/plugins/rspec/lib/spec/mocks/framework.rb +15 -0
- data/vendor/plugins/rspec/lib/spec/mocks/message_expectation.rb +74 -10
- data/vendor/plugins/rspec/lib/spec/mocks/methods.rb +15 -3
- data/vendor/plugins/rspec/lib/spec/mocks/mock.rb +13 -7
- data/vendor/plugins/rspec/lib/spec/mocks/proxy.rb +71 -17
- data/vendor/plugins/rspec/lib/spec/mocks/spec_methods.rb +9 -1
- data/vendor/plugins/rspec/lib/spec/mocks.rb +1 -12
- data/vendor/plugins/rspec/lib/spec/rake/spectask.rb +19 -27
- data/vendor/plugins/rspec/lib/spec/rake/verify_rcov.rb +3 -3
- data/vendor/plugins/rspec/lib/spec/runner/backtrace_tweaker.rb +7 -8
- data/vendor/plugins/rspec/lib/spec/runner/command_line.rb +6 -17
- data/vendor/plugins/rspec/lib/spec/runner/drb_command_line.rb +1 -1
- data/vendor/plugins/rspec/lib/spec/runner/formatter/base_formatter.rb +4 -3
- data/vendor/plugins/rspec/lib/spec/runner/formatter/base_text_formatter.rb +5 -9
- data/vendor/plugins/rspec/lib/spec/runner/formatter/failing_example_groups_formatter.rb +4 -8
- data/vendor/plugins/rspec/lib/spec/runner/formatter/html_formatter.rb +18 -14
- data/vendor/plugins/rspec/lib/spec/runner/formatter/nested_text_formatter.rb +65 -0
- data/vendor/plugins/rspec/lib/spec/runner/formatter/profile_formatter.rb +4 -0
- data/vendor/plugins/rspec/lib/spec/runner/formatter/progress_bar_formatter.rb +6 -2
- data/vendor/plugins/rspec/lib/spec/runner/formatter/specdoc_formatter.rb +1 -1
- data/vendor/plugins/rspec/lib/spec/runner/formatter/story/html_formatter.rb +62 -16
- data/vendor/plugins/rspec/lib/spec/runner/formatter/story/plain_text_formatter.rb +81 -18
- data/vendor/plugins/rspec/lib/spec/runner/formatter/story/progress_bar_formatter.rb +42 -0
- data/vendor/plugins/rspec/lib/spec/runner/heckle_runner.rb +2 -2
- data/vendor/plugins/rspec/lib/spec/runner/option_parser.rb +49 -45
- data/vendor/plugins/rspec/lib/spec/runner/options.rb +54 -20
- data/vendor/plugins/rspec/lib/spec/runner/reporter.rb +36 -12
- data/vendor/plugins/rspec/lib/spec/runner/spec_parser.rb +1 -1
- data/vendor/plugins/rspec/lib/spec/runner.rb +17 -6
- data/vendor/plugins/rspec/lib/spec/story/extensions/regexp.rb +2 -2
- data/vendor/plugins/rspec/lib/spec/story/extensions/string.rb +2 -2
- data/vendor/plugins/rspec/lib/spec/story/runner/plain_text_story_runner.rb +2 -2
- data/vendor/plugins/rspec/lib/spec/story/runner/scenario_runner.rb +8 -0
- data/vendor/plugins/rspec/lib/spec/story/runner/story_mediator.rb +15 -1
- data/vendor/plugins/rspec/lib/spec/story/runner/story_parser.rb +20 -0
- data/vendor/plugins/rspec/lib/spec/story/runner/story_runner.rb +3 -1
- data/vendor/plugins/rspec/lib/spec/story/runner.rb +8 -5
- data/vendor/plugins/rspec/lib/spec/story/step.rb +43 -31
- data/vendor/plugins/rspec/lib/spec/story/step_mother.rb +2 -1
- data/vendor/plugins/rspec/lib/spec/story/story.rb +8 -11
- data/vendor/plugins/rspec/lib/spec/story/world.rb +6 -3
- data/vendor/plugins/rspec/lib/spec/version.rb +13 -22
- data/vendor/plugins/rspec/lib/spec.rb +15 -13
- data/vendor/plugins/rspec/plugins/mock_frameworks/rspec.rb +2 -0
- data/vendor/plugins/rspec/rake_tasks/failing_examples_with_html.rake +1 -1
- data/vendor/plugins/rspec/rake_tasks/verify_rcov.rake +2 -2
- data/vendor/plugins/rspec/rspec.gemspec +22 -0
- data/vendor/plugins/rspec/spec/{autotest_helper.rb → autotest/autotest_helper.rb} +2 -2
- data/vendor/plugins/rspec/spec/{autotest_matchers.rb → autotest/autotest_matchers.rb} +0 -0
- data/vendor/plugins/rspec/spec/autotest/discover_spec.rb +1 -1
- data/vendor/plugins/rspec/spec/autotest/rspec_spec.rb +94 -139
- data/vendor/plugins/rspec/spec/rspec_suite.rb +0 -1
- data/vendor/plugins/rspec/spec/spec/adapters/ruby_engine_spec.rb +16 -0
- data/vendor/plugins/rspec/spec/spec/example/configuration_spec.rb +229 -215
- data/vendor/plugins/rspec/spec/spec/example/example_group_class_definition_spec.rb +9 -9
- data/vendor/plugins/rspec/spec/spec/example/example_group_factory_spec.rb +137 -101
- data/vendor/plugins/rspec/spec/spec/example/example_group_methods_spec.rb +456 -361
- data/vendor/plugins/rspec/spec/spec/example/example_group_spec.rb +460 -488
- data/vendor/plugins/rspec/spec/spec/example/example_methods_spec.rb +117 -52
- data/vendor/plugins/rspec/spec/spec/example/nested_example_group_spec.rb +12 -0
- data/vendor/plugins/rspec/spec/spec/example/pending_module_spec.rb +114 -0
- data/vendor/plugins/rspec/spec/spec/example/shared_example_group_spec.rb +219 -203
- data/vendor/plugins/rspec/spec/spec/expectations/differs/default_spec.rb +27 -9
- data/vendor/plugins/rspec/spec/spec/expectations/extensions/object_spec.rb +0 -12
- data/vendor/plugins/rspec/spec/spec/extensions/main_spec.rb +23 -28
- data/vendor/plugins/rspec/spec/spec/interop/test/unit/resources/spec_with_options_hash.rb +13 -0
- data/vendor/plugins/rspec/spec/spec/interop/test/unit/spec_spec.rb +15 -8
- data/vendor/plugins/rspec/spec/spec/interop/test/unit/testcase_spec.rb +4 -0
- data/vendor/plugins/rspec/spec/spec/matchers/be_spec.rb +24 -0
- data/vendor/plugins/rspec/spec/spec/matchers/change_spec.rb +16 -6
- data/vendor/plugins/rspec/spec/spec/matchers/handler_spec.rb +58 -37
- data/vendor/plugins/rspec/spec/spec/matchers/has_spec.rb +26 -0
- data/vendor/plugins/rspec/spec/spec/matchers/have_spec.rb +105 -2
- data/vendor/plugins/rspec/spec/spec/matchers/include_spec.rb +19 -0
- data/vendor/plugins/rspec/spec/spec/matchers/operator_matcher_spec.rb +35 -2
- data/vendor/plugins/rspec/spec/spec/matchers/raise_error_spec.rb +124 -0
- data/vendor/plugins/rspec/spec/spec/matchers/respond_to_spec.rb +6 -6
- data/vendor/plugins/rspec/spec/spec/matchers/simple_matcher_spec.rb +64 -2
- data/vendor/plugins/rspec/spec/spec/mocks/any_number_of_times_spec.rb +7 -0
- data/vendor/plugins/rspec/spec/spec/mocks/{bug_report_10263.rb → bug_report_10263_spec.rb} +0 -0
- data/vendor/plugins/rspec/spec/spec/mocks/bug_report_11545_spec.rb +2 -0
- data/vendor/plugins/rspec/spec/spec/mocks/bug_report_496.rb +17 -0
- data/vendor/plugins/rspec/spec/spec/mocks/failing_mock_argument_constraints_spec.rb +10 -30
- data/vendor/plugins/rspec/spec/spec/mocks/hash_including_matcher_spec.rb +53 -0
- data/vendor/plugins/rspec/spec/spec/mocks/mock_spec.rb +123 -43
- data/vendor/plugins/rspec/spec/spec/mocks/nil_expectation_warning_spec.rb +53 -0
- data/vendor/plugins/rspec/spec/spec/mocks/null_object_mock_spec.rb +14 -0
- data/vendor/plugins/rspec/spec/spec/mocks/options_hash_spec.rb +18 -28
- data/vendor/plugins/rspec/spec/spec/mocks/partial_mock_spec.rb +50 -7
- data/vendor/plugins/rspec/spec/spec/mocks/passing_mock_argument_constraints_spec.rb +26 -50
- data/vendor/plugins/rspec/spec/spec/mocks/stub_spec.rb +7 -0
- data/vendor/plugins/rspec/spec/spec/package/bin_spec_spec.rb +8 -0
- data/vendor/plugins/rspec/spec/spec/runner/command_line_spec.rb +102 -108
- data/vendor/plugins/rspec/spec/spec/runner/drb_command_line_spec.rb +11 -6
- data/vendor/plugins/rspec/spec/spec/runner/formatter/base_formatter_spec.rb +112 -0
- data/vendor/plugins/rspec/spec/spec/runner/formatter/failing_example_groups_formatter_spec.rb +3 -2
- data/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.6.html +30 -25
- data/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb +1 -6
- data/vendor/plugins/rspec/spec/spec/runner/formatter/nested_text_formatter_spec.rb +318 -0
- data/vendor/plugins/rspec/spec/spec/runner/formatter/progress_bar_formatter_spec.rb +30 -2
- data/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb +4 -4
- data/vendor/plugins/rspec/spec/spec/runner/formatter/specdoc_formatter_spec.rb +133 -100
- data/vendor/plugins/rspec/spec/spec/runner/formatter/story/html_formatter_spec.rb +76 -2
- data/vendor/plugins/rspec/spec/spec/runner/formatter/story/plain_text_formatter_spec.rb +266 -1
- data/vendor/plugins/rspec/spec/spec/runner/formatter/story/progress_bar_formatter_spec.rb +82 -0
- data/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatted-1.8.6.html +33 -28
- data/vendor/plugins/rspec/spec/spec/runner/heckle_runner_spec.rb +8 -8
- data/vendor/plugins/rspec/spec/spec/runner/option_parser_spec.rb +104 -61
- data/vendor/plugins/rspec/spec/spec/runner/options_spec.rb +103 -17
- data/vendor/plugins/rspec/spec/spec/runner/output_one_time_fixture_runner.rb +1 -1
- data/vendor/plugins/rspec/spec/spec/runner/quiet_backtrace_tweaker_spec.rb +6 -0
- data/vendor/plugins/rspec/spec/spec/runner/reporter_spec.rb +59 -10
- data/vendor/plugins/rspec/spec/spec/runner/spec_drb.opts +1 -0
- data/vendor/plugins/rspec/spec/spec/runner/spec_parser_spec.rb +10 -4
- data/vendor/plugins/rspec/spec/spec/story/runner/plain_text_story_runner_spec.rb +15 -17
- data/vendor/plugins/rspec/spec/spec/story/runner/scenario_runner_spec.rb +124 -52
- data/vendor/plugins/rspec/spec/spec/story/runner/story_mediator_spec.rb +12 -2
- data/vendor/plugins/rspec/spec/spec/story/runner/story_parser_spec.rb +23 -6
- data/vendor/plugins/rspec/spec/spec/story/runner/story_runner_spec.rb +43 -5
- data/vendor/plugins/rspec/spec/spec/story/runner_spec.rb +59 -72
- data/vendor/plugins/rspec/spec/spec/story/scenario_spec.rb +1 -3
- data/vendor/plugins/rspec/spec/spec/story/step_mother_spec.rb +12 -0
- data/vendor/plugins/rspec/spec/spec/story/step_spec.rb +76 -4
- data/vendor/plugins/rspec/spec/spec/story/story_spec.rb +3 -5
- data/vendor/plugins/rspec/spec/spec/story/world_spec.rb +8 -8
- data/vendor/plugins/rspec/spec/spec_helper.rb +40 -66
- data/vendor/plugins/rspec/stories/all.rb +1 -1
- data/vendor/plugins/rspec/stories/configuration/before_blocks.story +21 -0
- data/vendor/plugins/rspec/stories/configuration/stories.rb +7 -0
- data/vendor/plugins/rspec/stories/mock_framework_integration/stories.rb +7 -0
- data/vendor/plugins/rspec/stories/mock_framework_integration/use_flexmock.story +9 -0
- data/vendor/plugins/rspec/stories/resources/spec/before_blocks_example.rb +32 -0
- data/vendor/plugins/rspec/stories/resources/spec/spec_with_flexmock.rb +18 -0
- data/vendor/plugins/rspec/stories/stories/multiline_steps.story +23 -0
- data/vendor/plugins/rspec/stories/stories/steps/multiline_steps.rb +13 -0
- data/vendor/plugins/rspec/stories/stories/stories.rb +6 -0
- data/vendor/plugins/rspec-rails/History.txt +93 -0
- data/vendor/plugins/{rspec_on_rails/MIT-LICENSE → rspec-rails/License.txt} +7 -5
- data/vendor/plugins/rspec-rails/Manifest.txt +161 -0
- data/vendor/plugins/rspec-rails/README.txt +46 -0
- data/vendor/plugins/rspec-rails/Rakefile +39 -0
- data/vendor/plugins/rspec-rails/UPGRADE +7 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec/CHANGES +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec/rspec_generator.rb +9 -4
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec/templates/all_stories.rb +0 -0
- data/vendor/plugins/{rspec_on_rails/spec_resources/views/controller_spec/_partial.rhtml → rspec-rails/generators/rspec/templates/previous_failures.txt} +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec/templates/rcov.opts +0 -0
- data/vendor/plugins/{rspec_on_rails/tasks → rspec-rails/generators/rspec/templates}/rspec.rake +6 -11
- data/vendor/plugins/rspec-rails/generators/rspec/templates/script/autospec +5 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec/templates/script/spec +1 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec/templates/script/spec_server +18 -4
- data/vendor/plugins/rspec-rails/generators/rspec/templates/spec.opts +4 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec/templates/spec_helper.rb +8 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec/templates/stories_helper.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec_controller/USAGE +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec_controller/rspec_controller_generator.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec_controller/templates/controller_spec.rb +1 -1
- data/vendor/plugins/rspec-rails/generators/rspec_controller/templates/helper_spec.rb +11 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec_controller/templates/view_spec.rb +2 -2
- data/vendor/plugins/rspec-rails/generators/rspec_default_values.rb +19 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec_model/USAGE +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec_model/rspec_model_generator.rb +7 -2
- data/vendor/plugins/rspec-rails/generators/rspec_model/templates/model_spec.rb +15 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec_scaffold/rspec_scaffold_generator.rb +2 -15
- data/vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/controller_spec.rb +173 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec_scaffold/templates/edit_erb_spec.rb +8 -7
- data/vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/helper_spec.rb +11 -0
- data/vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/index_erb_spec.rb +27 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec_scaffold/templates/new_erb_spec.rb +7 -7
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec_scaffold/templates/routing_spec.rb +15 -17
- data/vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/show_erb_spec.rb +23 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/init.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/autotest/discover.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/autotest/rails_rspec.rb +1 -6
- data/vendor/plugins/rspec-rails/lib/spec/rails/example/assigns_hash_proxy.rb +40 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/example/controller_example_group.rb +56 -55
- data/vendor/plugins/rspec-rails/lib/spec/rails/example/cookies_proxy.rb +25 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/example/functional_example_group.rb +31 -10
- data/vendor/plugins/rspec-rails/lib/spec/rails/example/helper_example_group.rb +170 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/example/model_example_group.rb +0 -0
- data/vendor/plugins/rspec-rails/lib/spec/rails/example/rails_example_group.rb +33 -0
- data/vendor/plugins/rspec-rails/lib/spec/rails/example/render_observer.rb +93 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/example/view_example_group.rb +18 -6
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/example.rb +1 -1
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/extensions/action_controller/base.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/extensions/action_controller/rescue.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/extensions/action_controller/test_response.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/extensions/action_view/base.rb +8 -4
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/extensions/active_record/base.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/extensions/object.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/extensions/spec/example/configuration.rb +6 -1
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/extensions/spec/matchers/have.rb +2 -2
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/extensions.rb +0 -0
- data/vendor/plugins/rspec-rails/lib/spec/rails/interop/testcase.rb +14 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/matchers/assert_select.rb +1 -0
- data/vendor/plugins/rspec-rails/lib/spec/rails/matchers/change.rb +11 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/matchers/have_text.rb +4 -2
- data/vendor/plugins/rspec-rails/lib/spec/rails/matchers/include_text.rb +54 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/matchers/redirect_to.rb +1 -1
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/matchers/render_template.rb +26 -6
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/matchers.rb +2 -0
- data/vendor/plugins/rspec-rails/lib/spec/rails/mocks.rb +132 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/spec/rails/story_adapter.rb +11 -3
- data/vendor/plugins/rspec-rails/lib/spec/rails/version.rb +15 -0
- data/vendor/plugins/rspec-rails/lib/spec/rails.rb +15 -0
- data/vendor/plugins/rspec-rails/rspec-rails.gemspec +28 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/autotest/mappings_spec.rb +1 -1
- data/vendor/plugins/rspec-rails/spec/rails/example/assigns_hash_proxy_spec.rb +96 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/example/configuration_spec.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/example/controller_isolation_spec.rb +20 -1
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/example/controller_spec_spec.rb +119 -27
- data/vendor/plugins/rspec-rails/spec/rails/example/cookies_proxy_spec.rb +74 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/example/example_group_factory_spec.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/example/helper_spec_spec.rb +60 -4
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/example/model_spec_spec.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/example/shared_behaviour_spec.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/example/test_unit_assertion_accessibility_spec.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/example/view_spec_spec.rb +75 -51
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/extensions/action_controller_rescue_action_spec.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/extensions/action_view_base_spec.rb +10 -10
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/extensions/active_record_spec.rb +0 -0
- data/vendor/plugins/rspec-rails/spec/rails/interop/testcase_spec.rb +66 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/matchers/assert_select_spec.rb +34 -3
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/matchers/description_generation_spec.rb +0 -0
- data/vendor/plugins/rspec-rails/spec/rails/matchers/errors_on_spec.rb +25 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/matchers/have_text_spec.rb +0 -0
- data/vendor/plugins/rspec-rails/spec/rails/matchers/include_text_spec.rb +64 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/matchers/redirect_to_spec.rb +7 -1
- data/vendor/plugins/{rspec_on_rails/spec/rails/matchers/render_spec.rb → rspec-rails/spec/rails/matchers/render_template_spec.rb} +21 -14
- data/vendor/plugins/rspec-rails/spec/rails/matchers/should_change_spec.rb +15 -0
- data/vendor/plugins/rspec-rails/spec/rails/mocks/ar_classes.rb +10 -0
- data/vendor/plugins/rspec-rails/spec/rails/mocks/mock_model_spec.rb +106 -0
- data/vendor/plugins/rspec-rails/spec/rails/mocks/stub_model_spec.rb +80 -0
- data/vendor/plugins/rspec-rails/spec/rails/sample_modified_fixture.rb +8 -0
- data/vendor/plugins/rspec-rails/spec/rails/sample_spec.rb +8 -0
- data/vendor/plugins/rspec-rails/spec/rails/spec_server_spec.rb +96 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails/spec_spec.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/rails_suite.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec/spec_helper.rb +13 -1
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/controllers/action_view_base_spec_controller.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/controllers/controller_spec_controller.rb +46 -3
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/controllers/redirect_spec_controller.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/controllers/render_spec_controller.rb +4 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/controllers/rjs_spec_controller.rb +0 -0
- data/vendor/plugins/rspec-rails/spec_resources/helpers/addition_helper.rb +5 -0
- data/vendor/plugins/rspec-rails/spec_resources/helpers/explicit_helper.rb +38 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/helpers/more_explicit_helper.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/helpers/plugin_application_helper.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/helpers/view_spec_helper.rb +0 -0
- data/vendor/plugins/{rspec_on_rails/spec_resources/views/controller_spec/action_setting_the_assigns_hash.rhtml → rspec-rails/spec_resources/views/controller_spec/_partial.rhtml} +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/controller_spec/action_setting_flash_after_session_reset.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/controller_spec/action_setting_flash_before_session_reset.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails/spec_resources/views/render_spec/_a_partial.rhtml → rspec-rails/spec_resources/views/controller_spec/action_setting_the_assigns_hash.rhtml} +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/controller_spec/action_with_errors_in_template.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/controller_spec/action_with_template.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails/spec_resources/views/render_spec/some_action.rhtml → rspec-rails/spec_resources/views/layouts/application.rhtml} +0 -0
- data/vendor/plugins/{rspec_on_rails/spec_resources/views/view_spec/_partial_used_twice.rhtml → rspec-rails/spec_resources/views/layouts/simple.rhtml} +0 -0
- data/vendor/plugins/rspec-rails/spec_resources/views/objects/_object.html.erb +1 -0
- data/vendor/plugins/rspec-rails/spec_resources/views/render_spec/_a_partial.rhtml +0 -0
- data/vendor/plugins/rspec-rails/spec_resources/views/render_spec/action_with_alternate_layout.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/render_spec/some_action.js.rjs +0 -0
- data/vendor/plugins/rspec-rails/spec_resources/views/render_spec/some_action.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/render_spec/some_action.rjs +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/rjs_spec/_replacement_partial.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/rjs_spec/hide_div.rjs +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/rjs_spec/hide_page_element.rjs +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/rjs_spec/insert_html.rjs +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/rjs_spec/replace.rjs +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/rjs_spec/replace_html.rjs +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/rjs_spec/replace_html_with_partial.rjs +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/rjs_spec/visual_effect.rjs +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/rjs_spec/visual_toggle_effect.rjs +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/tag_spec/no_tags.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/tag_spec/single_div_with_no_attributes.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/tag_spec/single_div_with_one_attribute.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/view_spec/_partial.rhtml +0 -0
- data/vendor/plugins/rspec-rails/spec_resources/views/view_spec/_partial_used_twice.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/view_spec/_partial_with_local_variable.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/view_spec/_partial_with_sub_partial.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/view_spec/_spacer.rhtml +0 -0
- data/vendor/plugins/rspec-rails/spec_resources/views/view_spec/accessor.rhtml +5 -0
- data/vendor/plugins/rspec-rails/spec_resources/views/view_spec/block_helper.rhtml +3 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/view_spec/entry_form.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/view_spec/explicit_helper.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/view_spec/foo/show.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/view_spec/implicit_helper.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/view_spec/multiple_helpers.rhtml +0 -0
- data/vendor/plugins/rspec-rails/spec_resources/views/view_spec/should_not_receive.rhtml +3 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/view_spec/template_with_partial.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/view_spec/template_with_partial_using_collection.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/spec_resources/views/view_spec/template_with_partial_with_array.rhtml +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/stories/all.rb +0 -0
- data/vendor/plugins/rspec-rails/stories/configuration/stories.rb +5 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/stories/helper.rb +1 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/stories/steps/people.rb +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/stories/transactions_should_rollback +0 -0
- data/vendor/plugins/{rspec_on_rails → rspec-rails}/stories/transactions_should_rollback.rb +0 -0
- data/vendor/plugins/typo_textfilter_code/lib/typo_textfilter_code.rb +25 -20
- data/vendor/plugins/typo_textfilter_flickr/lib/typo_textfilter_flickr.rb +1 -1
- data/vendor/plugins/typo_textfilter_lightbox/lib/typo_textfilter_lightbox.rb +1 -1
- data/vendor/plugins/will_paginate/.manifest +49 -0
- data/vendor/plugins/will_paginate/CHANGELOG.rdoc +110 -0
- data/vendor/plugins/will_paginate/LICENSE +18 -0
- data/vendor/plugins/will_paginate/README.rdoc +107 -0
- data/vendor/plugins/will_paginate/Rakefile +62 -0
- data/vendor/plugins/will_paginate/examples/apple-circle.gif +0 -0
- data/vendor/plugins/will_paginate/examples/index.haml +69 -0
- data/vendor/plugins/will_paginate/examples/index.html +92 -0
- data/vendor/plugins/will_paginate/examples/pagination.css +90 -0
- data/vendor/plugins/will_paginate/examples/pagination.sass +91 -0
- data/vendor/plugins/will_paginate/init.rb +1 -0
- data/vendor/plugins/will_paginate/lib/will_paginate/array.rb +16 -0
- data/vendor/plugins/will_paginate/lib/will_paginate/collection.rb +146 -0
- data/vendor/plugins/will_paginate/lib/will_paginate/core_ext.rb +32 -0
- data/vendor/plugins/will_paginate/lib/will_paginate/finder.rb +260 -0
- data/vendor/plugins/will_paginate/lib/will_paginate/named_scope.rb +170 -0
- data/vendor/plugins/will_paginate/lib/will_paginate/named_scope_patch.rb +37 -0
- data/vendor/plugins/will_paginate/lib/will_paginate/version.rb +9 -0
- data/vendor/plugins/will_paginate/lib/will_paginate/view_helpers.rb +383 -0
- data/vendor/plugins/will_paginate/lib/will_paginate.rb +82 -0
- data/vendor/plugins/will_paginate/test/boot.rb +21 -0
- data/vendor/plugins/will_paginate/test/collection_test.rb +143 -0
- data/vendor/plugins/will_paginate/test/console +8 -0
- data/vendor/plugins/will_paginate/test/database.yml +22 -0
- data/vendor/plugins/will_paginate/test/finder_test.rb +476 -0
- data/vendor/plugins/will_paginate/test/fixtures/admin.rb +3 -0
- data/vendor/plugins/will_paginate/test/fixtures/developer.rb +14 -0
- data/vendor/plugins/{classic_pagination → will_paginate}/test/fixtures/developers_projects.yml +0 -0
- data/vendor/plugins/will_paginate/test/fixtures/project.rb +15 -0
- data/vendor/plugins/{classic_pagination → will_paginate}/test/fixtures/projects.yml +3 -4
- data/vendor/plugins/will_paginate/test/fixtures/replies.yml +29 -0
- data/vendor/plugins/{classic_pagination → will_paginate}/test/fixtures/reply.rb +2 -0
- data/vendor/plugins/will_paginate/test/fixtures/schema.rb +38 -0
- data/vendor/plugins/will_paginate/test/fixtures/topic.rb +10 -0
- data/vendor/plugins/{classic_pagination → will_paginate}/test/fixtures/topics.yml +9 -1
- data/vendor/plugins/will_paginate/test/fixtures/user.rb +2 -0
- data/vendor/plugins/{classic_pagination/test/fixtures/developers.yml → will_paginate/test/fixtures/users.yml} +15 -1
- data/vendor/plugins/will_paginate/test/helper.rb +37 -0
- data/vendor/plugins/will_paginate/test/lib/activerecord_test_case.rb +36 -0
- data/vendor/plugins/will_paginate/test/lib/activerecord_test_connector.rb +73 -0
- data/vendor/plugins/will_paginate/test/lib/load_fixtures.rb +11 -0
- data/vendor/plugins/will_paginate/test/lib/view_test_process.rb +165 -0
- data/vendor/plugins/will_paginate/test/tasks.rake +59 -0
- data/vendor/plugins/will_paginate/test/view_test.rb +363 -0
- data/vendor/plugins/will_paginate/will_paginate.gemspec +22 -0
- data/vendor/plugins/xml_sidebar/views/content.rhtml +3 -3
- metadata +614 -542
- data/CHANGES-5.1.3 +0 -21
- data/app/controllers/admin/comments_controller.rb +0 -57
- data/app/controllers/admin/trackbacks_controller.rb +0 -45
- data/app/views/accounts/logout.html.erb +0 -12
- data/app/views/accounts/welcome.html.erb +0 -13
- data/app/views/admin/categories/_quick_post.html.erb +0 -11
- data/app/views/admin/categories/edit.html.erb +0 -11
- data/app/views/admin/comments/destroy.html.erb +0 -11
- data/app/views/admin/comments/edit.html.erb +0 -14
- data/app/views/admin/comments/index.html.erb +0 -30
- data/app/views/admin/comments/show.html.erb +0 -28
- data/app/views/admin/content/_articles.html.erb +0 -47
- data/app/views/admin/content/_pages.html.erb +0 -3
- data/app/views/admin/content/edit.html.erb +0 -3
- data/app/views/admin/pages/_quick_post.html.erb +0 -21
- data/app/views/admin/settings/podcast.html.erb +0 -44
- data/app/views/admin/settings/spam.html.erb +0 -42
- data/app/views/admin/textfilters/_form.html.erb +0 -60
- data/app/views/admin/textfilters/_macros.html.erb +0 -16
- data/app/views/admin/textfilters/_textfilters.html.erb +0 -20
- data/app/views/admin/textfilters/destroy.html.erb +0 -10
- data/app/views/admin/textfilters/edit.html.erb +0 -14
- data/app/views/admin/textfilters/index.html.erb +0 -12
- data/app/views/admin/textfilters/macro_help.html.erb +0 -3
- data/app/views/admin/textfilters/new.html.erb +0 -12
- data/app/views/admin/textfilters/preview.html.erb +0 -3
- data/app/views/admin/textfilters/show.html.erb +0 -29
- data/app/views/admin/textfilters/show_help.html.erb +0 -4
- data/app/views/admin/trackbacks/_form.html.erb +0 -19
- data/app/views/admin/trackbacks/destroy.html.erb +0 -6
- data/app/views/admin/trackbacks/edit.html.erb +0 -11
- data/app/views/admin/trackbacks/index.html.erb +0 -22
- data/app/views/admin/trackbacks/show.html.erb +0 -14
- data/app/views/admin/users/_user.html.erb +0 -20
- data/doc/typo-4.0-release-notes.txt +0 -135
- data/public/images/admin/arrow_comment_group.gif +0 -0
- data/public/images/admin/bc-bg.gif +0 -0
- data/public/images/admin/bgdivider.png +0 -0
- data/public/images/admin/bgoff.png +0 -0
- data/public/images/admin/bgover.png +0 -0
- data/public/images/admin/bgselected.png +0 -0
- data/public/images/admin/cancel.png +0 -0
- data/public/images/admin/checked.png +0 -0
- data/public/images/admin/delete.png +0 -0
- data/public/images/admin/edit.png +0 -0
- data/public/images/admin/help.png +0 -0
- data/public/images/admin/loginformbg.png +0 -0
- data/public/images/admin/show.png +0 -0
- data/public/images/admin/table-header-first.png +0 -0
- data/public/stylesheets/typo_code.css +0 -62
- data/spec/controllers/admin/comments_controller_spec.rb +0 -74
- data/spec/controllers/admin/trackbacks_controller_spec.rb +0 -57
- data/spec/helpers/admin_base_helper_spec.rb +0 -13
- data/themes/dirtylicious/views/shared/_search.html.erb +0 -16
- data/themes/scribbish/views/shared/_search.html.erb +0 -16
- data/themes/standard_issue/views/shared/_search.html.erb +0 -17
- data/themes/typographic/views/shared/_search.html.erb +0 -17
- data/vendor/plugins/classic_pagination/CHANGELOG +0 -152
- data/vendor/plugins/classic_pagination/README +0 -18
- data/vendor/plugins/classic_pagination/init.rb +0 -33
- data/vendor/plugins/classic_pagination/install.rb +0 -1
- data/vendor/plugins/classic_pagination/lib/pagination.rb +0 -405
- data/vendor/plugins/classic_pagination/lib/pagination_helper.rb +0 -135
- data/vendor/plugins/classic_pagination/test/fixtures/companies.yml +0 -24
- data/vendor/plugins/classic_pagination/test/fixtures/company.rb +0 -9
- data/vendor/plugins/classic_pagination/test/fixtures/developer.rb +0 -7
- data/vendor/plugins/classic_pagination/test/fixtures/project.rb +0 -3
- data/vendor/plugins/classic_pagination/test/fixtures/replies.yml +0 -13
- data/vendor/plugins/classic_pagination/test/fixtures/schema.sql +0 -42
- data/vendor/plugins/classic_pagination/test/fixtures/topic.rb +0 -3
- data/vendor/plugins/classic_pagination/test/helper.rb +0 -117
- data/vendor/plugins/classic_pagination/test/pagination_helper_test.rb +0 -38
- data/vendor/plugins/classic_pagination/test/pagination_test.rb +0 -177
- data/vendor/plugins/rspec/README +0 -71
- data/vendor/plugins/rspec/TODO +0 -2
- data/vendor/plugins/rspec/UPGRADE +0 -31
- data/vendor/plugins/rspec/autotest/discover.rb +0 -6
- data/vendor/plugins/rspec/autotest/rspec.rb +0 -1
- data/vendor/plugins/rspec/bin/spec_translator +0 -8
- data/vendor/plugins/rspec/lib/spec/mocks/argument_constraint_matchers.rb +0 -27
- data/vendor/plugins/rspec/lib/spec/translator.rb +0 -114
- data/vendor/plugins/rspec/pre_commit/lib/pre_commit/core.rb +0 -50
- data/vendor/plugins/rspec/pre_commit/lib/pre_commit/pre_commit.rb +0 -54
- data/vendor/plugins/rspec/pre_commit/lib/pre_commit/rspec.rb +0 -111
- data/vendor/plugins/rspec/pre_commit/lib/pre_commit/rspec_on_rails.rb +0 -313
- data/vendor/plugins/rspec/pre_commit/lib/pre_commit.rb +0 -4
- data/vendor/plugins/rspec/pre_commit/spec/pre_commit/pre_commit_spec.rb +0 -15
- data/vendor/plugins/rspec/pre_commit/spec/pre_commit/rspec_on_rails_spec.rb +0 -36
- data/vendor/plugins/rspec/pre_commit/spec/spec_helper.rb +0 -3
- data/vendor/plugins/rspec/pre_commit/spec/spec_suite.rb +0 -11
- data/vendor/plugins/rspec/report.html +0 -4358
- data/vendor/plugins/rspec/spec/spec/example/example_spec.rb +0 -53
- data/vendor/plugins/rspec/spec/spec/runner/execution_context_spec.rb +0 -31
- data/vendor/plugins/rspec/spec/spec/translator_spec.rb +0 -265
- data/vendor/plugins/rspec_on_rails/README +0 -3
- data/vendor/plugins/rspec_on_rails/Rakefile +0 -9
- data/vendor/plugins/rspec_on_rails/generators/rspec/templates/spec.opts +0 -6
- data/vendor/plugins/rspec_on_rails/generators/rspec_controller/templates/helper_spec.rb +0 -11
- data/vendor/plugins/rspec_on_rails/generators/rspec_model/templates/model_spec.rb +0 -11
- data/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/controller_spec.rb +0 -313
- data/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/helper_spec.rb +0 -11
- data/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/index_erb_spec.rb +0 -22
- data/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/show_erb_spec.rb +0 -22
- data/vendor/plugins/rspec_on_rails/lib/spec/rails/example/assigns_hash_proxy.rb +0 -42
- data/vendor/plugins/rspec_on_rails/lib/spec/rails/example/helper_example_group.rb +0 -82
- data/vendor/plugins/rspec_on_rails/lib/spec/rails/example/ivar_proxy.rb +0 -62
- data/vendor/plugins/rspec_on_rails/lib/spec/rails/example/rails_example_group.rb +0 -68
- data/vendor/plugins/rspec_on_rails/lib/spec/rails/example/render_observer.rb +0 -90
- data/vendor/plugins/rspec_on_rails/lib/spec/rails/version.rb +0 -23
- data/vendor/plugins/rspec_on_rails/lib/spec/rails.rb +0 -51
- data/vendor/plugins/rspec_on_rails/spec/rails/autotest/rails_rspec_spec.rb +0 -8
- data/vendor/plugins/rspec_on_rails/spec/rails/example/assigns_hash_proxy_spec.rb +0 -55
- data/vendor/plugins/rspec_on_rails/spec/rails/example/ivar_proxy_spec.rb +0 -64
- data/vendor/plugins/rspec_on_rails/spec/rails/matchers/errors_on_spec.rb +0 -13
- data/vendor/plugins/rspec_on_rails/spec/rails/mocks/mock_model_spec.rb +0 -65
- data/vendor/plugins/rspec_on_rails/spec/rails/sample_spec.rb +0 -7
- data/vendor/plugins/rspec_on_rails/spec/rails/spec_server_spec.rb +0 -89
- data/vendor/plugins/rspec_on_rails/spec_resources/helpers/explicit_helper.rb +0 -10
- data/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/accessor.rhtml +0 -3
- data/vendor/syntax/LICENSE +0 -27
- data/vendor/syntax/NEWS +0 -16
- data/vendor/syntax/README +0 -38
- data/vendor/syntax/Rakefile +0 -194
- data/vendor/syntax/api/classes/Syntax/Convertors/Abstract.html +0 -159
- data/vendor/syntax/api/classes/Syntax/Convertors/HTML.html +0 -149
- data/vendor/syntax/api/classes/Syntax/Convertors.html +0 -91
- data/vendor/syntax/api/classes/Syntax/Default.html +0 -123
- data/vendor/syntax/api/classes/Syntax/Ruby.html +0 -319
- data/vendor/syntax/api/classes/Syntax/Token.html +0 -151
- data/vendor/syntax/api/classes/Syntax/Tokenizer.html +0 -324
- data/vendor/syntax/api/classes/Syntax/Version.html +0 -109
- data/vendor/syntax/api/classes/Syntax/XML.html +0 -205
- data/vendor/syntax/api/classes/Syntax/YAML.html +0 -189
- data/vendor/syntax/api/classes/Syntax.html +0 -173
- data/vendor/syntax/api/created.rid +0 -1
- data/vendor/syntax/api/files/README.html +0 -155
- data/vendor/syntax/api/files/lib/syntax/common_rb.html +0 -96
- data/vendor/syntax/api/files/lib/syntax/convertors/abstract_rb.html +0 -96
- data/vendor/syntax/api/files/lib/syntax/convertors/html_rb.html +0 -96
- data/vendor/syntax/api/files/lib/syntax/lang/ruby_rb.html +0 -96
- data/vendor/syntax/api/files/lib/syntax/lang/xml_rb.html +0 -96
- data/vendor/syntax/api/files/lib/syntax/lang/yaml_rb.html +0 -96
- data/vendor/syntax/api/files/lib/syntax/version_rb.html +0 -92
- data/vendor/syntax/api/files/lib/syntax_rb.html +0 -96
- data/vendor/syntax/api/fr_class_index.html +0 -56
- data/vendor/syntax/api/fr_file_index.html +0 -54
- data/vendor/syntax/api/fr_method_index.html +0 -65
- data/vendor/syntax/api/index.html +0 -26
- data/vendor/syntax/api/rdoc-style.css +0 -175
- data/vendor/syntax/doc/manual/chapter.erb +0 -38
- data/vendor/syntax/doc/manual/example.erb +0 -18
- data/vendor/syntax/doc/manual/index.erb +0 -29
- data/vendor/syntax/doc/manual/manual.rb +0 -311
- data/vendor/syntax/doc/manual/manual.yml +0 -43
- data/vendor/syntax/doc/manual/page.erb +0 -87
- data/vendor/syntax/doc/manual/parts/0000.txt +0 -5
- data/vendor/syntax/doc/manual/parts/0001.txt +0 -16
- data/vendor/syntax/doc/manual/parts/0002.txt +0 -24
- data/vendor/syntax/doc/manual/parts/0003.txt +0 -6
- data/vendor/syntax/doc/manual/parts/0004.txt +0 -32
- data/vendor/syntax/doc/manual/parts/0005.txt +0 -18
- data/vendor/syntax/doc/manual/parts/0006.txt +0 -62
- data/vendor/syntax/doc/manual/parts/0007.txt +0 -3
- data/vendor/syntax/doc/manual/parts/0008.txt +0 -5
- data/vendor/syntax/doc/manual/parts/0009.txt +0 -29
- data/vendor/syntax/doc/manual/parts/0010.txt +0 -21
- data/vendor/syntax/doc/manual/stylesheets/manual.css +0 -270
- data/vendor/syntax/doc/manual/stylesheets/ruby.css +0 -17
- data/vendor/syntax/doc/manual/tutorial.erb +0 -30
- data/vendor/syntax/doc/manual-html/chapter-1.html +0 -198
- data/vendor/syntax/doc/manual-html/chapter-2.html +0 -262
- data/vendor/syntax/doc/manual-html/chapter-3.html +0 -266
- data/vendor/syntax/doc/manual-html/chapter-4.html +0 -267
- data/vendor/syntax/doc/manual-html/index.html +0 -152
- data/vendor/syntax/doc/manual-html/stylesheets/manual.css +0 -270
- data/vendor/syntax/doc/manual-html/stylesheets/ruby.css +0 -17
- data/vendor/syntax/lib/syntax/common.rb +0 -163
- data/vendor/syntax/lib/syntax/convertors/abstract.rb +0 -27
- data/vendor/syntax/lib/syntax/convertors/html.rb +0 -51
- data/vendor/syntax/lib/syntax/lang/ruby.rb +0 -317
- data/vendor/syntax/lib/syntax/lang/xml.rb +0 -108
- data/vendor/syntax/lib/syntax/lang/yaml.rb +0 -105
- data/vendor/syntax/lib/syntax/version.rb +0 -9
- data/vendor/syntax/lib/syntax.rb +0 -38
- data/vendor/syntax/setup.rb +0 -1331
- data/vendor/syntax/syntax.gemspec +0 -24
- data/vendor/syntax/test/ALL-TESTS.rb +0 -5
- data/vendor/syntax/test/syntax/tc_ruby.rb +0 -871
- data/vendor/syntax/test/syntax/tc_xml.rb +0 -202
- data/vendor/syntax/test/syntax/tc_yaml.rb +0 -228
- data/vendor/syntax/test/syntax/tokenizer_testcase.rb +0 -40
- data/vendor/syntax/test/tc_syntax.rb +0 -22
@@ -0,0 +1,972 @@
|
|
1
|
+
// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
|
2
|
+
// (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
|
3
|
+
//
|
4
|
+
// script.aculo.us is freely distributable under the terms of an MIT-style license.
|
5
|
+
// For details, see the script.aculo.us web site: http://script.aculo.us/
|
6
|
+
|
7
|
+
if(Object.isUndefined(Effect))
|
8
|
+
throw("dragdrop.js requires including script.aculo.us' effects.js library");
|
9
|
+
|
10
|
+
var Droppables = {
|
11
|
+
drops: [],
|
12
|
+
|
13
|
+
remove: function(element) {
|
14
|
+
this.drops = this.drops.reject(function(d) { return d.element==$(element) });
|
15
|
+
},
|
16
|
+
|
17
|
+
add: function(element) {
|
18
|
+
element = $(element);
|
19
|
+
var options = Object.extend({
|
20
|
+
greedy: true,
|
21
|
+
hoverclass: null,
|
22
|
+
tree: false
|
23
|
+
}, arguments[1] || { });
|
24
|
+
|
25
|
+
// cache containers
|
26
|
+
if(options.containment) {
|
27
|
+
options._containers = [];
|
28
|
+
var containment = options.containment;
|
29
|
+
if(Object.isArray(containment)) {
|
30
|
+
containment.each( function(c) { options._containers.push($(c)) });
|
31
|
+
} else {
|
32
|
+
options._containers.push($(containment));
|
33
|
+
}
|
34
|
+
}
|
35
|
+
|
36
|
+
if(options.accept) options.accept = [options.accept].flatten();
|
37
|
+
|
38
|
+
Element.makePositioned(element); // fix IE
|
39
|
+
options.element = element;
|
40
|
+
|
41
|
+
this.drops.push(options);
|
42
|
+
},
|
43
|
+
|
44
|
+
findDeepestChild: function(drops) {
|
45
|
+
deepest = drops[0];
|
46
|
+
|
47
|
+
for (i = 1; i < drops.length; ++i)
|
48
|
+
if (Element.isParent(drops[i].element, deepest.element))
|
49
|
+
deepest = drops[i];
|
50
|
+
|
51
|
+
return deepest;
|
52
|
+
},
|
53
|
+
|
54
|
+
isContained: function(element, drop) {
|
55
|
+
var containmentNode;
|
56
|
+
if(drop.tree) {
|
57
|
+
containmentNode = element.treeNode;
|
58
|
+
} else {
|
59
|
+
containmentNode = element.parentNode;
|
60
|
+
}
|
61
|
+
return drop._containers.detect(function(c) { return containmentNode == c });
|
62
|
+
},
|
63
|
+
|
64
|
+
isAffected: function(point, element, drop) {
|
65
|
+
return (
|
66
|
+
(drop.element!=element) &&
|
67
|
+
((!drop._containers) ||
|
68
|
+
this.isContained(element, drop)) &&
|
69
|
+
((!drop.accept) ||
|
70
|
+
(Element.classNames(element).detect(
|
71
|
+
function(v) { return drop.accept.include(v) } ) )) &&
|
72
|
+
Position.within(drop.element, point[0], point[1]) );
|
73
|
+
},
|
74
|
+
|
75
|
+
deactivate: function(drop) {
|
76
|
+
if(drop.hoverclass)
|
77
|
+
Element.removeClassName(drop.element, drop.hoverclass);
|
78
|
+
this.last_active = null;
|
79
|
+
},
|
80
|
+
|
81
|
+
activate: function(drop) {
|
82
|
+
if(drop.hoverclass)
|
83
|
+
Element.addClassName(drop.element, drop.hoverclass);
|
84
|
+
this.last_active = drop;
|
85
|
+
},
|
86
|
+
|
87
|
+
show: function(point, element) {
|
88
|
+
if(!this.drops.length) return;
|
89
|
+
var drop, affected = [];
|
90
|
+
|
91
|
+
this.drops.each( function(drop) {
|
92
|
+
if(Droppables.isAffected(point, element, drop))
|
93
|
+
affected.push(drop);
|
94
|
+
});
|
95
|
+
|
96
|
+
if(affected.length>0)
|
97
|
+
drop = Droppables.findDeepestChild(affected);
|
98
|
+
|
99
|
+
if(this.last_active && this.last_active != drop) this.deactivate(this.last_active);
|
100
|
+
if (drop) {
|
101
|
+
Position.within(drop.element, point[0], point[1]);
|
102
|
+
if(drop.onHover)
|
103
|
+
drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));
|
104
|
+
|
105
|
+
if (drop != this.last_active) Droppables.activate(drop);
|
106
|
+
}
|
107
|
+
},
|
108
|
+
|
109
|
+
fire: function(event, element) {
|
110
|
+
if(!this.last_active) return;
|
111
|
+
Position.prepare();
|
112
|
+
|
113
|
+
if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active))
|
114
|
+
if (this.last_active.onDrop) {
|
115
|
+
this.last_active.onDrop(element, this.last_active.element, event);
|
116
|
+
return true;
|
117
|
+
}
|
118
|
+
},
|
119
|
+
|
120
|
+
reset: function() {
|
121
|
+
if(this.last_active)
|
122
|
+
this.deactivate(this.last_active);
|
123
|
+
}
|
124
|
+
}
|
125
|
+
|
126
|
+
var Draggables = {
|
127
|
+
drags: [],
|
128
|
+
observers: [],
|
129
|
+
|
130
|
+
register: function(draggable) {
|
131
|
+
if(this.drags.length == 0) {
|
132
|
+
this.eventMouseUp = this.endDrag.bindAsEventListener(this);
|
133
|
+
this.eventMouseMove = this.updateDrag.bindAsEventListener(this);
|
134
|
+
this.eventKeypress = this.keyPress.bindAsEventListener(this);
|
135
|
+
|
136
|
+
Event.observe(document, "mouseup", this.eventMouseUp);
|
137
|
+
Event.observe(document, "mousemove", this.eventMouseMove);
|
138
|
+
Event.observe(document, "keypress", this.eventKeypress);
|
139
|
+
}
|
140
|
+
this.drags.push(draggable);
|
141
|
+
},
|
142
|
+
|
143
|
+
unregister: function(draggable) {
|
144
|
+
this.drags = this.drags.reject(function(d) { return d==draggable });
|
145
|
+
if(this.drags.length == 0) {
|
146
|
+
Event.stopObserving(document, "mouseup", this.eventMouseUp);
|
147
|
+
Event.stopObserving(document, "mousemove", this.eventMouseMove);
|
148
|
+
Event.stopObserving(document, "keypress", this.eventKeypress);
|
149
|
+
}
|
150
|
+
},
|
151
|
+
|
152
|
+
activate: function(draggable) {
|
153
|
+
if(draggable.options.delay) {
|
154
|
+
this._timeout = setTimeout(function() {
|
155
|
+
Draggables._timeout = null;
|
156
|
+
window.focus();
|
157
|
+
Draggables.activeDraggable = draggable;
|
158
|
+
}.bind(this), draggable.options.delay);
|
159
|
+
} else {
|
160
|
+
window.focus(); // allows keypress events if window isn't currently focused, fails for Safari
|
161
|
+
this.activeDraggable = draggable;
|
162
|
+
}
|
163
|
+
},
|
164
|
+
|
165
|
+
deactivate: function() {
|
166
|
+
this.activeDraggable = null;
|
167
|
+
},
|
168
|
+
|
169
|
+
updateDrag: function(event) {
|
170
|
+
if(!this.activeDraggable) return;
|
171
|
+
var pointer = [Event.pointerX(event), Event.pointerY(event)];
|
172
|
+
// Mozilla-based browsers fire successive mousemove events with
|
173
|
+
// the same coordinates, prevent needless redrawing (moz bug?)
|
174
|
+
if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return;
|
175
|
+
this._lastPointer = pointer;
|
176
|
+
|
177
|
+
this.activeDraggable.updateDrag(event, pointer);
|
178
|
+
},
|
179
|
+
|
180
|
+
endDrag: function(event) {
|
181
|
+
if(this._timeout) {
|
182
|
+
clearTimeout(this._timeout);
|
183
|
+
this._timeout = null;
|
184
|
+
}
|
185
|
+
if(!this.activeDraggable) return;
|
186
|
+
this._lastPointer = null;
|
187
|
+
this.activeDraggable.endDrag(event);
|
188
|
+
this.activeDraggable = null;
|
189
|
+
},
|
190
|
+
|
191
|
+
keyPress: function(event) {
|
192
|
+
if(this.activeDraggable)
|
193
|
+
this.activeDraggable.keyPress(event);
|
194
|
+
},
|
195
|
+
|
196
|
+
addObserver: function(observer) {
|
197
|
+
this.observers.push(observer);
|
198
|
+
this._cacheObserverCallbacks();
|
199
|
+
},
|
200
|
+
|
201
|
+
removeObserver: function(element) { // element instead of observer fixes mem leaks
|
202
|
+
this.observers = this.observers.reject( function(o) { return o.element==element });
|
203
|
+
this._cacheObserverCallbacks();
|
204
|
+
},
|
205
|
+
|
206
|
+
notify: function(eventName, draggable, event) { // 'onStart', 'onEnd', 'onDrag'
|
207
|
+
if(this[eventName+'Count'] > 0)
|
208
|
+
this.observers.each( function(o) {
|
209
|
+
if(o[eventName]) o[eventName](eventName, draggable, event);
|
210
|
+
});
|
211
|
+
if(draggable.options[eventName]) draggable.options[eventName](draggable, event);
|
212
|
+
},
|
213
|
+
|
214
|
+
_cacheObserverCallbacks: function() {
|
215
|
+
['onStart','onEnd','onDrag'].each( function(eventName) {
|
216
|
+
Draggables[eventName+'Count'] = Draggables.observers.select(
|
217
|
+
function(o) { return o[eventName]; }
|
218
|
+
).length;
|
219
|
+
});
|
220
|
+
}
|
221
|
+
}
|
222
|
+
|
223
|
+
/*--------------------------------------------------------------------------*/
|
224
|
+
|
225
|
+
var Draggable = Class.create({
|
226
|
+
initialize: function(element) {
|
227
|
+
var defaults = {
|
228
|
+
handle: false,
|
229
|
+
reverteffect: function(element, top_offset, left_offset) {
|
230
|
+
var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02;
|
231
|
+
new Effect.Move(element, { x: -left_offset, y: -top_offset, duration: dur,
|
232
|
+
queue: {scope:'_draggable', position:'end'}
|
233
|
+
});
|
234
|
+
},
|
235
|
+
endeffect: function(element) {
|
236
|
+
var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0;
|
237
|
+
new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity,
|
238
|
+
queue: {scope:'_draggable', position:'end'},
|
239
|
+
afterFinish: function(){
|
240
|
+
Draggable._dragging[element] = false
|
241
|
+
}
|
242
|
+
});
|
243
|
+
},
|
244
|
+
zindex: 1000,
|
245
|
+
revert: false,
|
246
|
+
quiet: false,
|
247
|
+
scroll: false,
|
248
|
+
scrollSensitivity: 20,
|
249
|
+
scrollSpeed: 15,
|
250
|
+
snap: false, // false, or xy or [x,y] or function(x,y){ return [x,y] }
|
251
|
+
delay: 0
|
252
|
+
};
|
253
|
+
|
254
|
+
if(!arguments[1] || Object.isUndefined(arguments[1].endeffect))
|
255
|
+
Object.extend(defaults, {
|
256
|
+
starteffect: function(element) {
|
257
|
+
element._opacity = Element.getOpacity(element);
|
258
|
+
Draggable._dragging[element] = true;
|
259
|
+
new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7});
|
260
|
+
}
|
261
|
+
});
|
262
|
+
|
263
|
+
var options = Object.extend(defaults, arguments[1] || { });
|
264
|
+
|
265
|
+
this.element = $(element);
|
266
|
+
|
267
|
+
if(options.handle && Object.isString(options.handle))
|
268
|
+
this.handle = this.element.down('.'+options.handle, 0);
|
269
|
+
|
270
|
+
if(!this.handle) this.handle = $(options.handle);
|
271
|
+
if(!this.handle) this.handle = this.element;
|
272
|
+
|
273
|
+
if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) {
|
274
|
+
options.scroll = $(options.scroll);
|
275
|
+
this._isScrollChild = Element.childOf(this.element, options.scroll);
|
276
|
+
}
|
277
|
+
|
278
|
+
Element.makePositioned(this.element); // fix IE
|
279
|
+
|
280
|
+
this.options = options;
|
281
|
+
this.dragging = false;
|
282
|
+
|
283
|
+
this.eventMouseDown = this.initDrag.bindAsEventListener(this);
|
284
|
+
Event.observe(this.handle, "mousedown", this.eventMouseDown);
|
285
|
+
|
286
|
+
Draggables.register(this);
|
287
|
+
},
|
288
|
+
|
289
|
+
destroy: function() {
|
290
|
+
Event.stopObserving(this.handle, "mousedown", this.eventMouseDown);
|
291
|
+
Draggables.unregister(this);
|
292
|
+
},
|
293
|
+
|
294
|
+
currentDelta: function() {
|
295
|
+
return([
|
296
|
+
parseInt(Element.getStyle(this.element,'left') || '0'),
|
297
|
+
parseInt(Element.getStyle(this.element,'top') || '0')]);
|
298
|
+
},
|
299
|
+
|
300
|
+
initDrag: function(event) {
|
301
|
+
if(!Object.isUndefined(Draggable._dragging[this.element]) &&
|
302
|
+
Draggable._dragging[this.element]) return;
|
303
|
+
if(Event.isLeftClick(event)) {
|
304
|
+
// abort on form elements, fixes a Firefox issue
|
305
|
+
var src = Event.element(event);
|
306
|
+
if((tag_name = src.tagName.toUpperCase()) && (
|
307
|
+
tag_name=='INPUT' ||
|
308
|
+
tag_name=='SELECT' ||
|
309
|
+
tag_name=='OPTION' ||
|
310
|
+
tag_name=='BUTTON' ||
|
311
|
+
tag_name=='TEXTAREA')) return;
|
312
|
+
|
313
|
+
var pointer = [Event.pointerX(event), Event.pointerY(event)];
|
314
|
+
var pos = Position.cumulativeOffset(this.element);
|
315
|
+
this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) });
|
316
|
+
|
317
|
+
Draggables.activate(this);
|
318
|
+
Event.stop(event);
|
319
|
+
}
|
320
|
+
},
|
321
|
+
|
322
|
+
startDrag: function(event) {
|
323
|
+
this.dragging = true;
|
324
|
+
if(!this.delta)
|
325
|
+
this.delta = this.currentDelta();
|
326
|
+
|
327
|
+
if(this.options.zindex) {
|
328
|
+
this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
|
329
|
+
this.element.style.zIndex = this.options.zindex;
|
330
|
+
}
|
331
|
+
|
332
|
+
if(this.options.ghosting) {
|
333
|
+
this._clone = this.element.cloneNode(true);
|
334
|
+
this.element._originallyAbsolute = (this.element.getStyle('position') == 'absolute');
|
335
|
+
if (!this.element._originallyAbsolute)
|
336
|
+
Position.absolutize(this.element);
|
337
|
+
this.element.parentNode.insertBefore(this._clone, this.element);
|
338
|
+
}
|
339
|
+
|
340
|
+
if(this.options.scroll) {
|
341
|
+
if (this.options.scroll == window) {
|
342
|
+
var where = this._getWindowScroll(this.options.scroll);
|
343
|
+
this.originalScrollLeft = where.left;
|
344
|
+
this.originalScrollTop = where.top;
|
345
|
+
} else {
|
346
|
+
this.originalScrollLeft = this.options.scroll.scrollLeft;
|
347
|
+
this.originalScrollTop = this.options.scroll.scrollTop;
|
348
|
+
}
|
349
|
+
}
|
350
|
+
|
351
|
+
Draggables.notify('onStart', this, event);
|
352
|
+
|
353
|
+
if(this.options.starteffect) this.options.starteffect(this.element);
|
354
|
+
},
|
355
|
+
|
356
|
+
updateDrag: function(event, pointer) {
|
357
|
+
if(!this.dragging) this.startDrag(event);
|
358
|
+
|
359
|
+
if(!this.options.quiet){
|
360
|
+
Position.prepare();
|
361
|
+
Droppables.show(pointer, this.element);
|
362
|
+
}
|
363
|
+
|
364
|
+
Draggables.notify('onDrag', this, event);
|
365
|
+
|
366
|
+
this.draw(pointer);
|
367
|
+
if(this.options.change) this.options.change(this);
|
368
|
+
|
369
|
+
if(this.options.scroll) {
|
370
|
+
this.stopScrolling();
|
371
|
+
|
372
|
+
var p;
|
373
|
+
if (this.options.scroll == window) {
|
374
|
+
with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; }
|
375
|
+
} else {
|
376
|
+
p = Position.page(this.options.scroll);
|
377
|
+
p[0] += this.options.scroll.scrollLeft + Position.deltaX;
|
378
|
+
p[1] += this.options.scroll.scrollTop + Position.deltaY;
|
379
|
+
p.push(p[0]+this.options.scroll.offsetWidth);
|
380
|
+
p.push(p[1]+this.options.scroll.offsetHeight);
|
381
|
+
}
|
382
|
+
var speed = [0,0];
|
383
|
+
if(pointer[0] < (p[0]+this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[0]+this.options.scrollSensitivity);
|
384
|
+
if(pointer[1] < (p[1]+this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[1]+this.options.scrollSensitivity);
|
385
|
+
if(pointer[0] > (p[2]-this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[2]-this.options.scrollSensitivity);
|
386
|
+
if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity);
|
387
|
+
this.startScrolling(speed);
|
388
|
+
}
|
389
|
+
|
390
|
+
// fix AppleWebKit rendering
|
391
|
+
if(Prototype.Browser.WebKit) window.scrollBy(0,0);
|
392
|
+
|
393
|
+
Event.stop(event);
|
394
|
+
},
|
395
|
+
|
396
|
+
finishDrag: function(event, success) {
|
397
|
+
this.dragging = false;
|
398
|
+
|
399
|
+
if(this.options.quiet){
|
400
|
+
Position.prepare();
|
401
|
+
var pointer = [Event.pointerX(event), Event.pointerY(event)];
|
402
|
+
Droppables.show(pointer, this.element);
|
403
|
+
}
|
404
|
+
|
405
|
+
if(this.options.ghosting) {
|
406
|
+
if (!this.element._originallyAbsolute)
|
407
|
+
Position.relativize(this.element);
|
408
|
+
delete this.element._originallyAbsolute;
|
409
|
+
Element.remove(this._clone);
|
410
|
+
this._clone = null;
|
411
|
+
}
|
412
|
+
|
413
|
+
var dropped = false;
|
414
|
+
if(success) {
|
415
|
+
dropped = Droppables.fire(event, this.element);
|
416
|
+
if (!dropped) dropped = false;
|
417
|
+
}
|
418
|
+
if(dropped && this.options.onDropped) this.options.onDropped(this.element);
|
419
|
+
Draggables.notify('onEnd', this, event);
|
420
|
+
|
421
|
+
var revert = this.options.revert;
|
422
|
+
if(revert && Object.isFunction(revert)) revert = revert(this.element);
|
423
|
+
|
424
|
+
var d = this.currentDelta();
|
425
|
+
if(revert && this.options.reverteffect) {
|
426
|
+
if (dropped == 0 || revert != 'failure')
|
427
|
+
this.options.reverteffect(this.element,
|
428
|
+
d[1]-this.delta[1], d[0]-this.delta[0]);
|
429
|
+
} else {
|
430
|
+
this.delta = d;
|
431
|
+
}
|
432
|
+
|
433
|
+
if(this.options.zindex)
|
434
|
+
this.element.style.zIndex = this.originalZ;
|
435
|
+
|
436
|
+
if(this.options.endeffect)
|
437
|
+
this.options.endeffect(this.element);
|
438
|
+
|
439
|
+
Draggables.deactivate(this);
|
440
|
+
Droppables.reset();
|
441
|
+
},
|
442
|
+
|
443
|
+
keyPress: function(event) {
|
444
|
+
if(event.keyCode!=Event.KEY_ESC) return;
|
445
|
+
this.finishDrag(event, false);
|
446
|
+
Event.stop(event);
|
447
|
+
},
|
448
|
+
|
449
|
+
endDrag: function(event) {
|
450
|
+
if(!this.dragging) return;
|
451
|
+
this.stopScrolling();
|
452
|
+
this.finishDrag(event, true);
|
453
|
+
Event.stop(event);
|
454
|
+
},
|
455
|
+
|
456
|
+
draw: function(point) {
|
457
|
+
var pos = Position.cumulativeOffset(this.element);
|
458
|
+
if(this.options.ghosting) {
|
459
|
+
var r = Position.realOffset(this.element);
|
460
|
+
pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY;
|
461
|
+
}
|
462
|
+
|
463
|
+
var d = this.currentDelta();
|
464
|
+
pos[0] -= d[0]; pos[1] -= d[1];
|
465
|
+
|
466
|
+
if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) {
|
467
|
+
pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
|
468
|
+
pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
|
469
|
+
}
|
470
|
+
|
471
|
+
var p = [0,1].map(function(i){
|
472
|
+
return (point[i]-pos[i]-this.offset[i])
|
473
|
+
}.bind(this));
|
474
|
+
|
475
|
+
if(this.options.snap) {
|
476
|
+
if(Object.isFunction(this.options.snap)) {
|
477
|
+
p = this.options.snap(p[0],p[1],this);
|
478
|
+
} else {
|
479
|
+
if(Object.isArray(this.options.snap)) {
|
480
|
+
p = p.map( function(v, i) {
|
481
|
+
return (v/this.options.snap[i]).round()*this.options.snap[i] }.bind(this))
|
482
|
+
} else {
|
483
|
+
p = p.map( function(v) {
|
484
|
+
return (v/this.options.snap).round()*this.options.snap }.bind(this))
|
485
|
+
}
|
486
|
+
}}
|
487
|
+
|
488
|
+
var style = this.element.style;
|
489
|
+
if((!this.options.constraint) || (this.options.constraint=='horizontal'))
|
490
|
+
style.left = p[0] + "px";
|
491
|
+
if((!this.options.constraint) || (this.options.constraint=='vertical'))
|
492
|
+
style.top = p[1] + "px";
|
493
|
+
|
494
|
+
if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
|
495
|
+
},
|
496
|
+
|
497
|
+
stopScrolling: function() {
|
498
|
+
if(this.scrollInterval) {
|
499
|
+
clearInterval(this.scrollInterval);
|
500
|
+
this.scrollInterval = null;
|
501
|
+
Draggables._lastScrollPointer = null;
|
502
|
+
}
|
503
|
+
},
|
504
|
+
|
505
|
+
startScrolling: function(speed) {
|
506
|
+
if(!(speed[0] || speed[1])) return;
|
507
|
+
this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed];
|
508
|
+
this.lastScrolled = new Date();
|
509
|
+
this.scrollInterval = setInterval(this.scroll.bind(this), 10);
|
510
|
+
},
|
511
|
+
|
512
|
+
scroll: function() {
|
513
|
+
var current = new Date();
|
514
|
+
var delta = current - this.lastScrolled;
|
515
|
+
this.lastScrolled = current;
|
516
|
+
if(this.options.scroll == window) {
|
517
|
+
with (this._getWindowScroll(this.options.scroll)) {
|
518
|
+
if (this.scrollSpeed[0] || this.scrollSpeed[1]) {
|
519
|
+
var d = delta / 1000;
|
520
|
+
this.options.scroll.scrollTo( left + d*this.scrollSpeed[0], top + d*this.scrollSpeed[1] );
|
521
|
+
}
|
522
|
+
}
|
523
|
+
} else {
|
524
|
+
this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000;
|
525
|
+
this.options.scroll.scrollTop += this.scrollSpeed[1] * delta / 1000;
|
526
|
+
}
|
527
|
+
|
528
|
+
Position.prepare();
|
529
|
+
Droppables.show(Draggables._lastPointer, this.element);
|
530
|
+
Draggables.notify('onDrag', this);
|
531
|
+
if (this._isScrollChild) {
|
532
|
+
Draggables._lastScrollPointer = Draggables._lastScrollPointer || $A(Draggables._lastPointer);
|
533
|
+
Draggables._lastScrollPointer[0] += this.scrollSpeed[0] * delta / 1000;
|
534
|
+
Draggables._lastScrollPointer[1] += this.scrollSpeed[1] * delta / 1000;
|
535
|
+
if (Draggables._lastScrollPointer[0] < 0)
|
536
|
+
Draggables._lastScrollPointer[0] = 0;
|
537
|
+
if (Draggables._lastScrollPointer[1] < 0)
|
538
|
+
Draggables._lastScrollPointer[1] = 0;
|
539
|
+
this.draw(Draggables._lastScrollPointer);
|
540
|
+
}
|
541
|
+
|
542
|
+
if(this.options.change) this.options.change(this);
|
543
|
+
},
|
544
|
+
|
545
|
+
_getWindowScroll: function(w) {
|
546
|
+
var T, L, W, H;
|
547
|
+
with (w.document) {
|
548
|
+
if (w.document.documentElement && documentElement.scrollTop) {
|
549
|
+
T = documentElement.scrollTop;
|
550
|
+
L = documentElement.scrollLeft;
|
551
|
+
} else if (w.document.body) {
|
552
|
+
T = body.scrollTop;
|
553
|
+
L = body.scrollLeft;
|
554
|
+
}
|
555
|
+
if (w.innerWidth) {
|
556
|
+
W = w.innerWidth;
|
557
|
+
H = w.innerHeight;
|
558
|
+
} else if (w.document.documentElement && documentElement.clientWidth) {
|
559
|
+
W = documentElement.clientWidth;
|
560
|
+
H = documentElement.clientHeight;
|
561
|
+
} else {
|
562
|
+
W = body.offsetWidth;
|
563
|
+
H = body.offsetHeight
|
564
|
+
}
|
565
|
+
}
|
566
|
+
return { top: T, left: L, width: W, height: H };
|
567
|
+
}
|
568
|
+
});
|
569
|
+
|
570
|
+
Draggable._dragging = { };
|
571
|
+
|
572
|
+
/*--------------------------------------------------------------------------*/
|
573
|
+
|
574
|
+
var SortableObserver = Class.create({
|
575
|
+
initialize: function(element, observer) {
|
576
|
+
this.element = $(element);
|
577
|
+
this.observer = observer;
|
578
|
+
this.lastValue = Sortable.serialize(this.element);
|
579
|
+
},
|
580
|
+
|
581
|
+
onStart: function() {
|
582
|
+
this.lastValue = Sortable.serialize(this.element);
|
583
|
+
},
|
584
|
+
|
585
|
+
onEnd: function() {
|
586
|
+
Sortable.unmark();
|
587
|
+
if(this.lastValue != Sortable.serialize(this.element))
|
588
|
+
this.observer(this.element)
|
589
|
+
}
|
590
|
+
});
|
591
|
+
|
592
|
+
var Sortable = {
|
593
|
+
SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/,
|
594
|
+
|
595
|
+
sortables: { },
|
596
|
+
|
597
|
+
_findRootElement: function(element) {
|
598
|
+
while (element.tagName.toUpperCase() != "BODY") {
|
599
|
+
if(element.id && Sortable.sortables[element.id]) return element;
|
600
|
+
element = element.parentNode;
|
601
|
+
}
|
602
|
+
},
|
603
|
+
|
604
|
+
options: function(element) {
|
605
|
+
element = Sortable._findRootElement($(element));
|
606
|
+
if(!element) return;
|
607
|
+
return Sortable.sortables[element.id];
|
608
|
+
},
|
609
|
+
|
610
|
+
destroy: function(element){
|
611
|
+
var s = Sortable.options(element);
|
612
|
+
|
613
|
+
if(s) {
|
614
|
+
Draggables.removeObserver(s.element);
|
615
|
+
s.droppables.each(function(d){ Droppables.remove(d) });
|
616
|
+
s.draggables.invoke('destroy');
|
617
|
+
|
618
|
+
delete Sortable.sortables[s.element.id];
|
619
|
+
}
|
620
|
+
},
|
621
|
+
|
622
|
+
create: function(element) {
|
623
|
+
element = $(element);
|
624
|
+
var options = Object.extend({
|
625
|
+
element: element,
|
626
|
+
tag: 'li', // assumes li children, override with tag: 'tagname'
|
627
|
+
dropOnEmpty: false,
|
628
|
+
tree: false,
|
629
|
+
treeTag: 'ul',
|
630
|
+
overlap: 'vertical', // one of 'vertical', 'horizontal'
|
631
|
+
constraint: 'vertical', // one of 'vertical', 'horizontal', false
|
632
|
+
containment: element, // also takes array of elements (or id's); or false
|
633
|
+
handle: false, // or a CSS class
|
634
|
+
only: false,
|
635
|
+
delay: 0,
|
636
|
+
hoverclass: null,
|
637
|
+
ghosting: false,
|
638
|
+
quiet: false,
|
639
|
+
scroll: false,
|
640
|
+
scrollSensitivity: 20,
|
641
|
+
scrollSpeed: 15,
|
642
|
+
format: this.SERIALIZE_RULE,
|
643
|
+
|
644
|
+
// these take arrays of elements or ids and can be
|
645
|
+
// used for better initialization performance
|
646
|
+
elements: false,
|
647
|
+
handles: false,
|
648
|
+
|
649
|
+
onChange: Prototype.emptyFunction,
|
650
|
+
onUpdate: Prototype.emptyFunction
|
651
|
+
}, arguments[1] || { });
|
652
|
+
|
653
|
+
// clear any old sortable with same element
|
654
|
+
this.destroy(element);
|
655
|
+
|
656
|
+
// build options for the draggables
|
657
|
+
var options_for_draggable = {
|
658
|
+
revert: true,
|
659
|
+
quiet: options.quiet,
|
660
|
+
scroll: options.scroll,
|
661
|
+
scrollSpeed: options.scrollSpeed,
|
662
|
+
scrollSensitivity: options.scrollSensitivity,
|
663
|
+
delay: options.delay,
|
664
|
+
ghosting: options.ghosting,
|
665
|
+
constraint: options.constraint,
|
666
|
+
handle: options.handle };
|
667
|
+
|
668
|
+
if(options.starteffect)
|
669
|
+
options_for_draggable.starteffect = options.starteffect;
|
670
|
+
|
671
|
+
if(options.reverteffect)
|
672
|
+
options_for_draggable.reverteffect = options.reverteffect;
|
673
|
+
else
|
674
|
+
if(options.ghosting) options_for_draggable.reverteffect = function(element) {
|
675
|
+
element.style.top = 0;
|
676
|
+
element.style.left = 0;
|
677
|
+
};
|
678
|
+
|
679
|
+
if(options.endeffect)
|
680
|
+
options_for_draggable.endeffect = options.endeffect;
|
681
|
+
|
682
|
+
if(options.zindex)
|
683
|
+
options_for_draggable.zindex = options.zindex;
|
684
|
+
|
685
|
+
// build options for the droppables
|
686
|
+
var options_for_droppable = {
|
687
|
+
overlap: options.overlap,
|
688
|
+
containment: options.containment,
|
689
|
+
tree: options.tree,
|
690
|
+
hoverclass: options.hoverclass,
|
691
|
+
onHover: Sortable.onHover
|
692
|
+
}
|
693
|
+
|
694
|
+
var options_for_tree = {
|
695
|
+
onHover: Sortable.onEmptyHover,
|
696
|
+
overlap: options.overlap,
|
697
|
+
containment: options.containment,
|
698
|
+
hoverclass: options.hoverclass
|
699
|
+
}
|
700
|
+
|
701
|
+
// fix for gecko engine
|
702
|
+
Element.cleanWhitespace(element);
|
703
|
+
|
704
|
+
options.draggables = [];
|
705
|
+
options.droppables = [];
|
706
|
+
|
707
|
+
// drop on empty handling
|
708
|
+
if(options.dropOnEmpty || options.tree) {
|
709
|
+
Droppables.add(element, options_for_tree);
|
710
|
+
options.droppables.push(element);
|
711
|
+
}
|
712
|
+
|
713
|
+
(options.elements || this.findElements(element, options) || []).each( function(e,i) {
|
714
|
+
var handle = options.handles ? $(options.handles[i]) :
|
715
|
+
(options.handle ? $(e).select('.' + options.handle)[0] : e);
|
716
|
+
options.draggables.push(
|
717
|
+
new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
|
718
|
+
Droppables.add(e, options_for_droppable);
|
719
|
+
if(options.tree) e.treeNode = element;
|
720
|
+
options.droppables.push(e);
|
721
|
+
});
|
722
|
+
|
723
|
+
if(options.tree) {
|
724
|
+
(Sortable.findTreeElements(element, options) || []).each( function(e) {
|
725
|
+
Droppables.add(e, options_for_tree);
|
726
|
+
e.treeNode = element;
|
727
|
+
options.droppables.push(e);
|
728
|
+
});
|
729
|
+
}
|
730
|
+
|
731
|
+
// keep reference
|
732
|
+
this.sortables[element.id] = options;
|
733
|
+
|
734
|
+
// for onupdate
|
735
|
+
Draggables.addObserver(new SortableObserver(element, options.onUpdate));
|
736
|
+
|
737
|
+
},
|
738
|
+
|
739
|
+
// return all suitable-for-sortable elements in a guaranteed order
|
740
|
+
findElements: function(element, options) {
|
741
|
+
return Element.findChildren(
|
742
|
+
element, options.only, options.tree ? true : false, options.tag);
|
743
|
+
},
|
744
|
+
|
745
|
+
findTreeElements: function(element, options) {
|
746
|
+
return Element.findChildren(
|
747
|
+
element, options.only, options.tree ? true : false, options.treeTag);
|
748
|
+
},
|
749
|
+
|
750
|
+
onHover: function(element, dropon, overlap) {
|
751
|
+
if(Element.isParent(dropon, element)) return;
|
752
|
+
|
753
|
+
if(overlap > .33 && overlap < .66 && Sortable.options(dropon).tree) {
|
754
|
+
return;
|
755
|
+
} else if(overlap>0.5) {
|
756
|
+
Sortable.mark(dropon, 'before');
|
757
|
+
if(dropon.previousSibling != element) {
|
758
|
+
var oldParentNode = element.parentNode;
|
759
|
+
element.style.visibility = "hidden"; // fix gecko rendering
|
760
|
+
dropon.parentNode.insertBefore(element, dropon);
|
761
|
+
if(dropon.parentNode!=oldParentNode)
|
762
|
+
Sortable.options(oldParentNode).onChange(element);
|
763
|
+
Sortable.options(dropon.parentNode).onChange(element);
|
764
|
+
}
|
765
|
+
} else {
|
766
|
+
Sortable.mark(dropon, 'after');
|
767
|
+
var nextElement = dropon.nextSibling || null;
|
768
|
+
if(nextElement != element) {
|
769
|
+
var oldParentNode = element.parentNode;
|
770
|
+
element.style.visibility = "hidden"; // fix gecko rendering
|
771
|
+
dropon.parentNode.insertBefore(element, nextElement);
|
772
|
+
if(dropon.parentNode!=oldParentNode)
|
773
|
+
Sortable.options(oldParentNode).onChange(element);
|
774
|
+
Sortable.options(dropon.parentNode).onChange(element);
|
775
|
+
}
|
776
|
+
}
|
777
|
+
},
|
778
|
+
|
779
|
+
onEmptyHover: function(element, dropon, overlap) {
|
780
|
+
var oldParentNode = element.parentNode;
|
781
|
+
var droponOptions = Sortable.options(dropon);
|
782
|
+
|
783
|
+
if(!Element.isParent(dropon, element)) {
|
784
|
+
var index;
|
785
|
+
|
786
|
+
var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only});
|
787
|
+
var child = null;
|
788
|
+
|
789
|
+
if(children) {
|
790
|
+
var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap);
|
791
|
+
|
792
|
+
for (index = 0; index < children.length; index += 1) {
|
793
|
+
if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) {
|
794
|
+
offset -= Element.offsetSize (children[index], droponOptions.overlap);
|
795
|
+
} else if (offset - (Element.offsetSize (children[index], droponOptions.overlap) / 2) >= 0) {
|
796
|
+
child = index + 1 < children.length ? children[index + 1] : null;
|
797
|
+
break;
|
798
|
+
} else {
|
799
|
+
child = children[index];
|
800
|
+
break;
|
801
|
+
}
|
802
|
+
}
|
803
|
+
}
|
804
|
+
|
805
|
+
dropon.insertBefore(element, child);
|
806
|
+
|
807
|
+
Sortable.options(oldParentNode).onChange(element);
|
808
|
+
droponOptions.onChange(element);
|
809
|
+
}
|
810
|
+
},
|
811
|
+
|
812
|
+
unmark: function() {
|
813
|
+
if(Sortable._marker) Sortable._marker.hide();
|
814
|
+
},
|
815
|
+
|
816
|
+
mark: function(dropon, position) {
|
817
|
+
// mark on ghosting only
|
818
|
+
var sortable = Sortable.options(dropon.parentNode);
|
819
|
+
if(sortable && !sortable.ghosting) return;
|
820
|
+
|
821
|
+
if(!Sortable._marker) {
|
822
|
+
Sortable._marker =
|
823
|
+
($('dropmarker') || Element.extend(document.createElement('DIV'))).
|
824
|
+
hide().addClassName('dropmarker').setStyle({position:'absolute'});
|
825
|
+
document.getElementsByTagName("body").item(0).appendChild(Sortable._marker);
|
826
|
+
}
|
827
|
+
var offsets = Position.cumulativeOffset(dropon);
|
828
|
+
Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'});
|
829
|
+
|
830
|
+
if(position=='after')
|
831
|
+
if(sortable.overlap == 'horizontal')
|
832
|
+
Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'});
|
833
|
+
else
|
834
|
+
Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'});
|
835
|
+
|
836
|
+
Sortable._marker.show();
|
837
|
+
},
|
838
|
+
|
839
|
+
_tree: function(element, options, parent) {
|
840
|
+
var children = Sortable.findElements(element, options) || [];
|
841
|
+
|
842
|
+
for (var i = 0; i < children.length; ++i) {
|
843
|
+
var match = children[i].id.match(options.format);
|
844
|
+
|
845
|
+
if (!match) continue;
|
846
|
+
|
847
|
+
var child = {
|
848
|
+
id: encodeURIComponent(match ? match[1] : null),
|
849
|
+
element: element,
|
850
|
+
parent: parent,
|
851
|
+
children: [],
|
852
|
+
position: parent.children.length,
|
853
|
+
container: $(children[i]).down(options.treeTag)
|
854
|
+
}
|
855
|
+
|
856
|
+
/* Get the element containing the children and recurse over it */
|
857
|
+
if (child.container)
|
858
|
+
this._tree(child.container, options, child)
|
859
|
+
|
860
|
+
parent.children.push (child);
|
861
|
+
}
|
862
|
+
|
863
|
+
return parent;
|
864
|
+
},
|
865
|
+
|
866
|
+
tree: function(element) {
|
867
|
+
element = $(element);
|
868
|
+
var sortableOptions = this.options(element);
|
869
|
+
var options = Object.extend({
|
870
|
+
tag: sortableOptions.tag,
|
871
|
+
treeTag: sortableOptions.treeTag,
|
872
|
+
only: sortableOptions.only,
|
873
|
+
name: element.id,
|
874
|
+
format: sortableOptions.format
|
875
|
+
}, arguments[1] || { });
|
876
|
+
|
877
|
+
var root = {
|
878
|
+
id: null,
|
879
|
+
parent: null,
|
880
|
+
children: [],
|
881
|
+
container: element,
|
882
|
+
position: 0
|
883
|
+
}
|
884
|
+
|
885
|
+
return Sortable._tree(element, options, root);
|
886
|
+
},
|
887
|
+
|
888
|
+
/* Construct a [i] index for a particular node */
|
889
|
+
_constructIndex: function(node) {
|
890
|
+
var index = '';
|
891
|
+
do {
|
892
|
+
if (node.id) index = '[' + node.position + ']' + index;
|
893
|
+
} while ((node = node.parent) != null);
|
894
|
+
return index;
|
895
|
+
},
|
896
|
+
|
897
|
+
sequence: function(element) {
|
898
|
+
element = $(element);
|
899
|
+
var options = Object.extend(this.options(element), arguments[1] || { });
|
900
|
+
|
901
|
+
return $(this.findElements(element, options) || []).map( function(item) {
|
902
|
+
return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
|
903
|
+
});
|
904
|
+
},
|
905
|
+
|
906
|
+
setSequence: function(element, new_sequence) {
|
907
|
+
element = $(element);
|
908
|
+
var options = Object.extend(this.options(element), arguments[2] || { });
|
909
|
+
|
910
|
+
var nodeMap = { };
|
911
|
+
this.findElements(element, options).each( function(n) {
|
912
|
+
if (n.id.match(options.format))
|
913
|
+
nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode];
|
914
|
+
n.parentNode.removeChild(n);
|
915
|
+
});
|
916
|
+
|
917
|
+
new_sequence.each(function(ident) {
|
918
|
+
var n = nodeMap[ident];
|
919
|
+
if (n) {
|
920
|
+
n[1].appendChild(n[0]);
|
921
|
+
delete nodeMap[ident];
|
922
|
+
}
|
923
|
+
});
|
924
|
+
},
|
925
|
+
|
926
|
+
serialize: function(element) {
|
927
|
+
element = $(element);
|
928
|
+
var options = Object.extend(Sortable.options(element), arguments[1] || { });
|
929
|
+
var name = encodeURIComponent(
|
930
|
+
(arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
|
931
|
+
|
932
|
+
if (options.tree) {
|
933
|
+
return Sortable.tree(element, arguments[1]).children.map( function (item) {
|
934
|
+
return [name + Sortable._constructIndex(item) + "[id]=" +
|
935
|
+
encodeURIComponent(item.id)].concat(item.children.map(arguments.callee));
|
936
|
+
}).flatten().join('&');
|
937
|
+
} else {
|
938
|
+
return Sortable.sequence(element, arguments[1]).map( function(item) {
|
939
|
+
return name + "[]=" + encodeURIComponent(item);
|
940
|
+
}).join('&');
|
941
|
+
}
|
942
|
+
}
|
943
|
+
}
|
944
|
+
|
945
|
+
// Returns true if child is contained within element
|
946
|
+
Element.isParent = function(child, element) {
|
947
|
+
if (!child.parentNode || child == element) return false;
|
948
|
+
if (child.parentNode == element) return true;
|
949
|
+
return Element.isParent(child.parentNode, element);
|
950
|
+
}
|
951
|
+
|
952
|
+
Element.findChildren = function(element, only, recursive, tagName) {
|
953
|
+
if(!element.hasChildNodes()) return null;
|
954
|
+
tagName = tagName.toUpperCase();
|
955
|
+
if(only) only = [only].flatten();
|
956
|
+
var elements = [];
|
957
|
+
$A(element.childNodes).each( function(e) {
|
958
|
+
if(e.tagName && e.tagName.toUpperCase()==tagName &&
|
959
|
+
(!only || (Element.classNames(e).detect(function(v) { return only.include(v) }))))
|
960
|
+
elements.push(e);
|
961
|
+
if(recursive) {
|
962
|
+
var grandchildren = Element.findChildren(e, only, recursive, tagName);
|
963
|
+
if(grandchildren) elements.push(grandchildren);
|
964
|
+
}
|
965
|
+
});
|
966
|
+
|
967
|
+
return (elements.length>0 ? elements.flatten() : []);
|
968
|
+
}
|
969
|
+
|
970
|
+
Element.offsetSize = function (element, type) {
|
971
|
+
return element['offset' + ((type=='vertical' || type=='height') ? 'Height' : 'Width')];
|
972
|
+
}
|