diff --git a/.bazelrc b/.bazelrc index 4f9c63927..f83a19b89 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1,8 +1,9 @@ common --enable_platform_specific_config common --experimental_repository_cache_hardlinks -# specify python path on Windows for pyo3 compile +# specify python path for pyo3 compile build:windows --action_env="PYTHON_SYS_EXECUTABLE=c:\\python\\python.exe" +#build:linux --action_env="PYTHON_SYS_EXECUTABLE=/usr/local/bin/python3.8" # runfiles are off by default on Windows, and we need them build --enable_runfiles @@ -27,4 +28,10 @@ build --incompatible_default_to_explicit_init_py build:ci --show_timestamps --isatty=0 --color=yes --show_progress_rate_limit=5 +# the typescript generation hack in rules_svelte is not hermetic, and +# converts declared types in props to 'any' if it's not run locally. +# Fixing it properly will probably require moving the Svelte rules to +# ts_project() +build:ci --strategy Svelte=local + try-import %workspace%/user.bazelrc diff --git a/.buildkite/linux/entrypoint b/.buildkite/linux/entrypoint index 4514bcd39..00ebc3eb5 100755 --- a/.buildkite/linux/entrypoint +++ b/.buildkite/linux/entrypoint @@ -18,6 +18,9 @@ $BAZEL build $BUILDARGS ... echo "+++ Running tests" $BAZEL test $BUILDARGS ... +echo "--- Building wheels" +$BAZEL build dist + echo "--- Cleanup" # if tests succeed, back up node_modules folder mv ts/node_modules /state/ diff --git a/CONTRIBUTORS b/CONTRIBUTORS index a1ebd645f..ec2513433 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -66,10 +66,12 @@ David Allison Tsung-Han Yu Piotr Kubowicz RumovZ -Cecini +Cecini Krish Shah ianki - +rye761 +Guillem Palau Salvà +Meredith Derecho ******************** The text of the 3 clause BSD license follows: diff --git a/Cargo.lock b/Cargo.lock index 97b467eed..44e60d233 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -90,9 +90,9 @@ version = "0.0.0" [[package]] name = "anyhow" -version = "1.0.35" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c0df63cb2955042487fad3aefd2c6e3ae7389ac5dc1beb28921de0b69f779d4" +checksum = "ee67c11feeac938fae061b232e38e0b6d94f97a9df10e6271319325ac4c56a86" [[package]] name = "arc-swap" @@ -169,15 +169,15 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1ff21a63d3262af46b9f33a826a8d134e2d0d9b2179c86034948b732ea8b2a" +checksum = "b72c1f1154e234325b50864a349b9c8e56939e266a4c307c0f159812df2f9537" dependencies = [ "bytes 0.5.6", "flate2", "futures-core", "memchr", - "pin-project-lite 0.1.11", + "pin-project-lite 0.2.0", ] [[package]] @@ -295,6 +295,12 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" +[[package]] +name = "bytes" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f8e949d755f9d79112b5bb46938e0ef9d3804a0b16dfab13aafcaa5f0fa72" + [[package]] name = "cc" version = "1.0.66" @@ -413,9 +419,9 @@ dependencies = [ [[package]] name = "ctor" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fbaabec2c953050352311293be5c6aba8e141ba19d6811862b232d6fd020484" +checksum = "373c88d9506e2e9230f6107701b7d8425f4cb3f6df108ec3042a26e936666da5" dependencies = [ "quote", "syn", @@ -464,9 +470,9 @@ dependencies = [ [[package]] name = "dtoa" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b" +checksum = "88d7ed2934d741c6b37e33e3832298e8850b53fd2d2bea03873375596c7cea4e" [[package]] name = "either" @@ -637,9 +643,9 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" [[package]] name = "funty" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ba62103ce691c2fd80fbae2213dfdda9ce60804973ac6b6e97de818ea7f52c8" +checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" [[package]] name = "futures" @@ -823,9 +829,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" +checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" dependencies = [ "unicode-segmentation", ] @@ -1067,9 +1073,9 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" +checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" [[package]] name = "js-sys" @@ -1227,9 +1233,9 @@ checksum = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333" [[package]] name = "native-tls" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fcc7939b5edc4e4f86b1b4a04bb1498afaaf871b1a6691838ed06fcb48d3a3f" +checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4" dependencies = [ "lazy_static", "libc", @@ -1347,9 +1353,9 @@ checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" [[package]] name = "openssl" -version = "0.10.31" +version = "0.10.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d008f51b1acffa0d3450a68606e6a51c123012edaacb0f4e1426bd978869187" +checksum = "038d43985d1ddca7a9900630d8cd031b56e4794eecc2e9ea39dd17aa04399a70" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -1367,9 +1373,9 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" [[package]] name = "openssl-sys" -version = "0.9.59" +version = "0.9.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de52d8eabd217311538a39bba130d7dea1f1e118010fee7a033d966845e7d5fe" +checksum = "921fc71883267538946025deffb622905ecad223c28efbfdef9bb59a0175f3e6" dependencies = [ "autocfg", "cc", @@ -1391,9 +1397,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c6d9b8427445284a09c55be860a15855ab580a417ccad9da88f5a06787ced0" +checksum = "9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272" dependencies = [ "cfg-if 1.0.0", "instant", @@ -1533,19 +1539,21 @@ dependencies = [ [[package]] name = "prost" -version = "0.6.1" -source = "git+https://github.com/danburkert/prost.git?rev=4ded4a98ef339da0b7babd4efee3fbe8adaf746b#4ded4a98ef339da0b7babd4efee3fbe8adaf746b" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2" dependencies = [ - "bytes 0.5.6", + "bytes 1.0.0", "prost-derive", ] [[package]] name = "prost-build" -version = "0.6.1" -source = "git+https://github.com/danburkert/prost.git?rev=4ded4a98ef339da0b7babd4efee3fbe8adaf746b#4ded4a98ef339da0b7babd4efee3fbe8adaf746b" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32d3ebd75ac2679c2af3a92246639f9fcc8a442ee420719cc4fe195b98dd5fa3" dependencies = [ - "bytes 0.5.6", + "bytes 1.0.0", "heck", "itertools", "log", @@ -1559,8 +1567,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.6.1" -source = "git+https://github.com/danburkert/prost.git?rev=4ded4a98ef339da0b7babd4efee3fbe8adaf746b#4ded4a98ef339da0b7babd4efee3fbe8adaf746b" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4" dependencies = [ "anyhow", "itertools", @@ -1571,17 +1580,19 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.6.1" -source = "git+https://github.com/danburkert/prost.git?rev=4ded4a98ef339da0b7babd4efee3fbe8adaf746b#4ded4a98ef339da0b7babd4efee3fbe8adaf746b" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b518d7cdd93dab1d1122cf07fa9a60771836c668dde9d9e2a139f957f0d9f1bb" dependencies = [ - "bytes 0.5.6", + "bytes 1.0.0", "prost", ] [[package]] name = "pyo3" -version = "0.12.4" -source = "git+https://github.com/PyO3/pyo3.git?rev=92b7a9736c9585883df5ec5bc01004caa7f65106#92b7a9736c9585883df5ec5bc01004caa7f65106" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cdd01a4c2719dd1f3ceab0875fa1a2c2cd3c619477349d78f43cd716b345436" dependencies = [ "cfg-if 1.0.0", "ctor", @@ -1590,35 +1601,37 @@ dependencies = [ "libc", "parking_lot", "paste", - "pyo3cls", + "pyo3-macros", "unindent", ] [[package]] -name = "pyo3-derive-backend" -version = "0.12.4" -source = "git+https://github.com/PyO3/pyo3.git?rev=92b7a9736c9585883df5ec5bc01004caa7f65106#92b7a9736c9585883df5ec5bc01004caa7f65106" +name = "pyo3-macros" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f8218769d13e354f841d559a19b0cf22cfd55959c7046ef594e5f34dbe46d16" +dependencies = [ + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc4da0bfdf76f0a5971c698f2cb6b3f832a6f80f16dedeeb3f123eb0431ecce2" dependencies = [ "proc-macro2", "quote", "syn", ] -[[package]] -name = "pyo3cls" -version = "0.12.4" -source = "git+https://github.com/PyO3/pyo3.git?rev=92b7a9736c9585883df5ec5bc01004caa7f65106#92b7a9736c9585883df5ec5bc01004caa7f65106" -dependencies = [ - "pyo3-derive-backend", - "quote", - "syn", -] - [[package]] name = "quote" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" +checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" dependencies = [ "proc-macro2", ] @@ -1934,9 +1947,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779" +checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a" dependencies = [ "itoa", "ryu", @@ -2075,9 +2088,9 @@ checksum = "ae524f056d7d770e174287294f562e95044c68e88dec909a00d2094805db9d75" [[package]] name = "socket2" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97e0e9fd577458a4f61fb91fcb559ea2afecc54c934119421f9f5d3d5b1a1057" +checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" dependencies = [ "cfg-if 1.0.0", "libc", @@ -2110,9 +2123,9 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" [[package]] name = "syn" -version = "1.0.54" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2af957a63d6bd42255c359c93d9bfdb97076bd3b820897ce55ffbfbf107f44" +checksum = "a9802ddde94170d186eeee5005b798d9c159fa970403f1be19976d0cfb939b72" dependencies = [ "proc-macro2", "quote", @@ -2178,18 +2191,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e" +checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56" +checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1" dependencies = [ "proc-macro2", "quote", @@ -2315,9 +2328,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" dependencies = [ "serde", ] diff --git a/Cargo.toml b/Cargo.toml index 915de2e59..4f0dd4f81 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,6 +25,7 @@ targets = [ "x86_64-pc-windows-msvc", "x86_64-unknown-linux-gnu", "aarch64-apple-ios", + "aarch64-unknown-linux-gnu", ] genmode = "Remote" default_gen_buildrs = true diff --git a/cargo/BUILD.reqwest.bazel b/cargo/BUILD.reqwest.bazel index d9e9db848..de870ae48 100644 --- a/cargo/BUILD.reqwest.bazel +++ b/cargo/BUILD.reqwest.bazel @@ -57,11 +57,12 @@ rust_library( aliases = selects.with_or({ # ring on Linux ( + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): {}, "//conditions:default": { # native-tls - "@raze__native_tls__0_2_6//:native_tls": "native_tls_crate", + "@raze__native_tls__0_2_7//:native_tls": "native_tls_crate", }, }), crate_features = [ @@ -74,6 +75,7 @@ rust_library( ] + selects.with_or({ # ring on Linux ( + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ "__rustls", @@ -111,13 +113,14 @@ rust_library( "@raze__hyper_timeout__0_3_1//:hyper_timeout", "@raze__mime_guess__2_0_3//:mime_guess", "@raze__serde__1_0_118//:serde", - "@raze__serde_json__1_0_60//:serde_json", + "@raze__serde_json__1_0_61//:serde_json", "@raze__serde_urlencoded__0_6_1//:serde_urlencoded", "@raze__url__2_2_0//:url", ] + selects.with_or({ # cfg(not(target_arch = "wasm32")) ( "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", "@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc", @@ -151,6 +154,7 @@ rust_library( # ring on Linux ( "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", ): [ "@raze__hyper_rustls__0_21_0//:hyper_rustls", "@raze__rustls__0_18_1//:rustls", @@ -160,7 +164,7 @@ rust_library( # native-tls on other platforms "//conditions:default": [ "@raze__hyper_tls__0_4_3//:hyper_tls", - "@raze__native_tls__0_2_6//:native_tls", + "@raze__native_tls__0_2_7//:native_tls", "@raze__tokio_tls__0_3_1//:tokio_tls", ], }), diff --git a/cargo/crates.bzl b/cargo/crates.bzl index c320585d8..cfb24e414 100644 --- a/cargo/crates.bzl +++ b/cargo/crates.bzl @@ -53,12 +53,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__anyhow__1_0_35", - url = "https://crates.io/api/v1/crates/anyhow/1.0.35/download", + name = "raze__anyhow__1_0_37", + url = "https://crates.io/api/v1/crates/anyhow/1.0.37/download", type = "tar.gz", - sha256 = "2c0df63cb2955042487fad3aefd2c6e3ae7389ac5dc1beb28921de0b69f779d4", - strip_prefix = "anyhow-1.0.35", - build_file = Label("//cargo/remote:BUILD.anyhow-1.0.35.bazel"), + sha256 = "ee67c11feeac938fae061b232e38e0b6d94f97a9df10e6271319325ac4c56a86", + strip_prefix = "anyhow-1.0.37", + build_file = Label("//cargo/remote:BUILD.anyhow-1.0.37.bazel"), ) maybe( @@ -143,12 +143,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__async_compression__0_3_6", - url = "https://crates.io/api/v1/crates/async-compression/0.3.6/download", + name = "raze__async_compression__0_3_7", + url = "https://crates.io/api/v1/crates/async-compression/0.3.7/download", type = "tar.gz", - sha256 = "fb1ff21a63d3262af46b9f33a826a8d134e2d0d9b2179c86034948b732ea8b2a", - strip_prefix = "async-compression-0.3.6", - build_file = Label("//cargo/remote:BUILD.async-compression-0.3.6.bazel"), + sha256 = "b72c1f1154e234325b50864a349b9c8e56939e266a4c307c0f159812df2f9537", + strip_prefix = "async-compression-0.3.7", + build_file = Label("//cargo/remote:BUILD.async-compression-0.3.7.bazel"), ) maybe( @@ -281,6 +281,16 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:BUILD.bytes-0.5.6.bazel"), ) + maybe( + http_archive, + name = "raze__bytes__1_0_0", + url = "https://crates.io/api/v1/crates/bytes/1.0.0/download", + type = "tar.gz", + sha256 = "ad1f8e949d755f9d79112b5bb46938e0ef9d3804a0b16dfab13aafcaa5f0fa72", + strip_prefix = "bytes-1.0.0", + build_file = Label("//cargo/remote:BUILD.bytes-1.0.0.bazel"), + ) + maybe( http_archive, name = "raze__cc__1_0_66", @@ -413,12 +423,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__ctor__0_1_16", - url = "https://crates.io/api/v1/crates/ctor/0.1.16/download", + name = "raze__ctor__0_1_17", + url = "https://crates.io/api/v1/crates/ctor/0.1.17/download", type = "tar.gz", - sha256 = "7fbaabec2c953050352311293be5c6aba8e141ba19d6811862b232d6fd020484", - strip_prefix = "ctor-0.1.16", - build_file = Label("//cargo/remote:BUILD.ctor-0.1.16.bazel"), + sha256 = "373c88d9506e2e9230f6107701b7d8425f4cb3f6df108ec3042a26e936666da5", + strip_prefix = "ctor-0.1.17", + build_file = Label("//cargo/remote:BUILD.ctor-0.1.17.bazel"), ) maybe( @@ -463,12 +473,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__dtoa__0_4_6", - url = "https://crates.io/api/v1/crates/dtoa/0.4.6/download", + name = "raze__dtoa__0_4_7", + url = "https://crates.io/api/v1/crates/dtoa/0.4.7/download", type = "tar.gz", - sha256 = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b", - strip_prefix = "dtoa-0.4.6", - build_file = Label("//cargo/remote:BUILD.dtoa-0.4.6.bazel"), + sha256 = "88d7ed2934d741c6b37e33e3832298e8850b53fd2d2bea03873375596c7cea4e", + strip_prefix = "dtoa-0.4.7", + build_file = Label("//cargo/remote:BUILD.dtoa-0.4.7.bazel"), ) maybe( @@ -663,12 +673,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__funty__1_0_1", - url = "https://crates.io/api/v1/crates/funty/1.0.1/download", + name = "raze__funty__1_1_0", + url = "https://crates.io/api/v1/crates/funty/1.1.0/download", type = "tar.gz", - sha256 = "0ba62103ce691c2fd80fbae2213dfdda9ce60804973ac6b6e97de818ea7f52c8", - strip_prefix = "funty-1.0.1", - build_file = Label("//cargo/remote:BUILD.funty-1.0.1.bazel"), + sha256 = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7", + strip_prefix = "funty-1.1.0", + build_file = Label("//cargo/remote:BUILD.funty-1.1.0.bazel"), ) maybe( @@ -843,12 +853,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__heck__0_3_1", - url = "https://crates.io/api/v1/crates/heck/0.3.1/download", + name = "raze__heck__0_3_2", + url = "https://crates.io/api/v1/crates/heck/0.3.2/download", type = "tar.gz", - sha256 = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205", - strip_prefix = "heck-0.3.1", - build_file = Label("//cargo/remote:BUILD.heck-0.3.1.bazel"), + sha256 = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac", + strip_prefix = "heck-0.3.2", + build_file = Label("//cargo/remote:BUILD.heck-0.3.2.bazel"), ) maybe( @@ -1093,12 +1103,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__itoa__0_4_6", - url = "https://crates.io/api/v1/crates/itoa/0.4.6/download", + name = "raze__itoa__0_4_7", + url = "https://crates.io/api/v1/crates/itoa/0.4.7/download", type = "tar.gz", - sha256 = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6", - strip_prefix = "itoa-0.4.6", - build_file = Label("//cargo/remote:BUILD.itoa-0.4.6.bazel"), + sha256 = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736", + strip_prefix = "itoa-0.4.7", + build_file = Label("//cargo/remote:BUILD.itoa-0.4.7.bazel"), ) maybe( @@ -1273,12 +1283,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__native_tls__0_2_6", - url = "https://crates.io/api/v1/crates/native-tls/0.2.6/download", + name = "raze__native_tls__0_2_7", + url = "https://crates.io/api/v1/crates/native-tls/0.2.7/download", type = "tar.gz", - sha256 = "6fcc7939b5edc4e4f86b1b4a04bb1498afaaf871b1a6691838ed06fcb48d3a3f", - strip_prefix = "native-tls-0.2.6", - build_file = Label("//cargo/remote:BUILD.native-tls-0.2.6.bazel"), + sha256 = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4", + strip_prefix = "native-tls-0.2.7", + build_file = Label("//cargo/remote:BUILD.native-tls-0.2.7.bazel"), ) maybe( @@ -1393,12 +1403,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__openssl__0_10_31", - url = "https://crates.io/api/v1/crates/openssl/0.10.31/download", + name = "raze__openssl__0_10_32", + url = "https://crates.io/api/v1/crates/openssl/0.10.32/download", type = "tar.gz", - sha256 = "8d008f51b1acffa0d3450a68606e6a51c123012edaacb0f4e1426bd978869187", - strip_prefix = "openssl-0.10.31", - build_file = Label("//cargo/remote:BUILD.openssl-0.10.31.bazel"), + sha256 = "038d43985d1ddca7a9900630d8cd031b56e4794eecc2e9ea39dd17aa04399a70", + strip_prefix = "openssl-0.10.32", + build_file = Label("//cargo/remote:BUILD.openssl-0.10.32.bazel"), ) maybe( @@ -1413,12 +1423,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__openssl_sys__0_9_59", - url = "https://crates.io/api/v1/crates/openssl-sys/0.9.59/download", + name = "raze__openssl_sys__0_9_60", + url = "https://crates.io/api/v1/crates/openssl-sys/0.9.60/download", type = "tar.gz", - sha256 = "de52d8eabd217311538a39bba130d7dea1f1e118010fee7a033d966845e7d5fe", - strip_prefix = "openssl-sys-0.9.59", - build_file = Label("//cargo/remote:BUILD.openssl-sys-0.9.59.bazel"), + sha256 = "921fc71883267538946025deffb622905ecad223c28efbfdef9bb59a0175f3e6", + strip_prefix = "openssl-sys-0.9.60", + build_file = Label("//cargo/remote:BUILD.openssl-sys-0.9.60.bazel"), ) maybe( @@ -1433,12 +1443,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__parking_lot_core__0_8_1", - url = "https://crates.io/api/v1/crates/parking_lot_core/0.8.1/download", + name = "raze__parking_lot_core__0_8_2", + url = "https://crates.io/api/v1/crates/parking_lot_core/0.8.2/download", type = "tar.gz", - sha256 = "d7c6d9b8427445284a09c55be860a15855ab580a417ccad9da88f5a06787ced0", - strip_prefix = "parking_lot_core-0.8.1", - build_file = Label("//cargo/remote:BUILD.parking_lot_core-0.8.1.bazel"), + sha256 = "9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272", + strip_prefix = "parking_lot_core-0.8.2", + build_file = Label("//cargo/remote:BUILD.parking_lot_core-0.8.2.bazel"), ) maybe( @@ -1612,83 +1622,83 @@ def raze_fetch_remote_crates(): ) maybe( - new_git_repository, - name = "raze__prost__0_6_1", - remote = "https://github.com/danburkert/prost.git", - shallow_since = "1598739849 -0700", - commit = "4ded4a98ef339da0b7babd4efee3fbe8adaf746b", - build_file = Label("//cargo/remote:BUILD.prost-0.6.1.bazel"), - init_submodules = True, - ) - - maybe( - new_git_repository, - name = "raze__prost_build__0_6_1", - remote = "https://github.com/danburkert/prost.git", - shallow_since = "1598739849 -0700", - commit = "4ded4a98ef339da0b7babd4efee3fbe8adaf746b", - build_file = Label("//cargo/remote:BUILD.prost-build-0.6.1.bazel"), - init_submodules = True, - ) - - maybe( - new_git_repository, - name = "raze__prost_derive__0_6_1", - remote = "https://github.com/danburkert/prost.git", - shallow_since = "1598739849 -0700", - commit = "4ded4a98ef339da0b7babd4efee3fbe8adaf746b", - build_file = Label("//cargo/remote:BUILD.prost-derive-0.6.1.bazel"), - init_submodules = True, - ) - - maybe( - new_git_repository, - name = "raze__prost_types__0_6_1", - remote = "https://github.com/danburkert/prost.git", - shallow_since = "1598739849 -0700", - commit = "4ded4a98ef339da0b7babd4efee3fbe8adaf746b", - build_file = Label("//cargo/remote:BUILD.prost-types-0.6.1.bazel"), - init_submodules = True, - ) - - maybe( - new_git_repository, - name = "raze__pyo3__0_12_4", - remote = "https://github.com/PyO3/pyo3.git", - shallow_since = "1606725379 +0000", - commit = "92b7a9736c9585883df5ec5bc01004caa7f65106", - build_file = Label("//cargo/remote:BUILD.pyo3-0.12.4.bazel"), - init_submodules = True, - ) - - maybe( - new_git_repository, - name = "raze__pyo3_derive_backend__0_12_4", - remote = "https://github.com/PyO3/pyo3.git", - shallow_since = "1606725379 +0000", - commit = "92b7a9736c9585883df5ec5bc01004caa7f65106", - build_file = Label("//cargo/remote:BUILD.pyo3-derive-backend-0.12.4.bazel"), - init_submodules = True, - ) - - maybe( - new_git_repository, - name = "raze__pyo3cls__0_12_4", - remote = "https://github.com/PyO3/pyo3.git", - shallow_since = "1606725379 +0000", - commit = "92b7a9736c9585883df5ec5bc01004caa7f65106", - build_file = Label("//cargo/remote:BUILD.pyo3cls-0.12.4.bazel"), - init_submodules = True, + http_archive, + name = "raze__prost__0_7_0", + url = "https://crates.io/api/v1/crates/prost/0.7.0/download", + type = "tar.gz", + sha256 = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2", + strip_prefix = "prost-0.7.0", + build_file = Label("//cargo/remote:BUILD.prost-0.7.0.bazel"), ) maybe( http_archive, - name = "raze__quote__1_0_7", - url = "https://crates.io/api/v1/crates/quote/1.0.7/download", + name = "raze__prost_build__0_7_0", + url = "https://crates.io/api/v1/crates/prost-build/0.7.0/download", type = "tar.gz", - sha256 = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37", - strip_prefix = "quote-1.0.7", - build_file = Label("//cargo/remote:BUILD.quote-1.0.7.bazel"), + sha256 = "32d3ebd75ac2679c2af3a92246639f9fcc8a442ee420719cc4fe195b98dd5fa3", + strip_prefix = "prost-build-0.7.0", + build_file = Label("//cargo/remote:BUILD.prost-build-0.7.0.bazel"), + ) + + maybe( + http_archive, + name = "raze__prost_derive__0_7_0", + url = "https://crates.io/api/v1/crates/prost-derive/0.7.0/download", + type = "tar.gz", + sha256 = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4", + strip_prefix = "prost-derive-0.7.0", + build_file = Label("//cargo/remote:BUILD.prost-derive-0.7.0.bazel"), + ) + + maybe( + http_archive, + name = "raze__prost_types__0_7_0", + url = "https://crates.io/api/v1/crates/prost-types/0.7.0/download", + type = "tar.gz", + sha256 = "b518d7cdd93dab1d1122cf07fa9a60771836c668dde9d9e2a139f957f0d9f1bb", + strip_prefix = "prost-types-0.7.0", + build_file = Label("//cargo/remote:BUILD.prost-types-0.7.0.bazel"), + ) + + maybe( + http_archive, + name = "raze__pyo3__0_13_0", + url = "https://crates.io/api/v1/crates/pyo3/0.13.0/download", + type = "tar.gz", + sha256 = "5cdd01a4c2719dd1f3ceab0875fa1a2c2cd3c619477349d78f43cd716b345436", + strip_prefix = "pyo3-0.13.0", + build_file = Label("//cargo/remote:BUILD.pyo3-0.13.0.bazel"), + ) + + maybe( + http_archive, + name = "raze__pyo3_macros__0_13_0", + url = "https://crates.io/api/v1/crates/pyo3-macros/0.13.0/download", + type = "tar.gz", + sha256 = "7f8218769d13e354f841d559a19b0cf22cfd55959c7046ef594e5f34dbe46d16", + strip_prefix = "pyo3-macros-0.13.0", + build_file = Label("//cargo/remote:BUILD.pyo3-macros-0.13.0.bazel"), + ) + + maybe( + http_archive, + name = "raze__pyo3_macros_backend__0_13_0", + url = "https://crates.io/api/v1/crates/pyo3-macros-backend/0.13.0/download", + type = "tar.gz", + sha256 = "fc4da0bfdf76f0a5971c698f2cb6b3f832a6f80f16dedeeb3f123eb0431ecce2", + strip_prefix = "pyo3-macros-backend-0.13.0", + build_file = Label("//cargo/remote:BUILD.pyo3-macros-backend-0.13.0.bazel"), + ) + + maybe( + http_archive, + name = "raze__quote__1_0_8", + url = "https://crates.io/api/v1/crates/quote/1.0.8/download", + type = "tar.gz", + sha256 = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df", + strip_prefix = "quote-1.0.8", + build_file = Label("//cargo/remote:BUILD.quote-1.0.8.bazel"), ) maybe( @@ -1963,12 +1973,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__serde_json__1_0_60", - url = "https://crates.io/api/v1/crates/serde_json/1.0.60/download", + name = "raze__serde_json__1_0_61", + url = "https://crates.io/api/v1/crates/serde_json/1.0.61/download", type = "tar.gz", - sha256 = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779", - strip_prefix = "serde_json-1.0.60", - build_file = Label("//cargo/remote:BUILD.serde_json-1.0.60.bazel"), + sha256 = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a", + strip_prefix = "serde_json-1.0.61", + build_file = Label("//cargo/remote:BUILD.serde_json-1.0.61.bazel"), ) maybe( @@ -2103,12 +2113,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__socket2__0_3_18", - url = "https://crates.io/api/v1/crates/socket2/0.3.18/download", + name = "raze__socket2__0_3_19", + url = "https://crates.io/api/v1/crates/socket2/0.3.19/download", type = "tar.gz", - sha256 = "97e0e9fd577458a4f61fb91fcb559ea2afecc54c934119421f9f5d3d5b1a1057", - strip_prefix = "socket2-0.3.18", - build_file = Label("//cargo/remote:BUILD.socket2-0.3.18.bazel"), + sha256 = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e", + strip_prefix = "socket2-0.3.19", + build_file = Label("//cargo/remote:BUILD.socket2-0.3.19.bazel"), ) maybe( @@ -2153,12 +2163,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__syn__1_0_54", - url = "https://crates.io/api/v1/crates/syn/1.0.54/download", + name = "raze__syn__1_0_56", + url = "https://crates.io/api/v1/crates/syn/1.0.56/download", type = "tar.gz", - sha256 = "9a2af957a63d6bd42255c359c93d9bfdb97076bd3b820897ce55ffbfbf107f44", - strip_prefix = "syn-1.0.54", - build_file = Label("//cargo/remote:BUILD.syn-1.0.54.bazel"), + sha256 = "a9802ddde94170d186eeee5005b798d9c159fa970403f1be19976d0cfb939b72", + strip_prefix = "syn-1.0.56", + build_file = Label("//cargo/remote:BUILD.syn-1.0.56.bazel"), ) maybe( @@ -2223,22 +2233,22 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__thiserror__1_0_22", - url = "https://crates.io/api/v1/crates/thiserror/1.0.22/download", + name = "raze__thiserror__1_0_23", + url = "https://crates.io/api/v1/crates/thiserror/1.0.23/download", type = "tar.gz", - sha256 = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e", - strip_prefix = "thiserror-1.0.22", - build_file = Label("//cargo/remote:BUILD.thiserror-1.0.22.bazel"), + sha256 = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146", + strip_prefix = "thiserror-1.0.23", + build_file = Label("//cargo/remote:BUILD.thiserror-1.0.23.bazel"), ) maybe( http_archive, - name = "raze__thiserror_impl__1_0_22", - url = "https://crates.io/api/v1/crates/thiserror-impl/1.0.22/download", + name = "raze__thiserror_impl__1_0_23", + url = "https://crates.io/api/v1/crates/thiserror-impl/1.0.23/download", type = "tar.gz", - sha256 = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56", - strip_prefix = "thiserror-impl-1.0.22", - build_file = Label("//cargo/remote:BUILD.thiserror-impl-1.0.22.bazel"), + sha256 = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1", + strip_prefix = "thiserror-impl-1.0.23", + build_file = Label("//cargo/remote:BUILD.thiserror-impl-1.0.23.bazel"), ) maybe( @@ -2353,12 +2363,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__toml__0_5_7", - url = "https://crates.io/api/v1/crates/toml/0.5.7/download", + name = "raze__toml__0_5_8", + url = "https://crates.io/api/v1/crates/toml/0.5.8/download", type = "tar.gz", - sha256 = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645", - strip_prefix = "toml-0.5.7", - build_file = Label("//cargo/remote:BUILD.toml-0.5.7.bazel"), + sha256 = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa", + strip_prefix = "toml-0.5.8", + build_file = Label("//cargo/remote:BUILD.toml-0.5.8.bazel"), ) maybe( diff --git a/cargo/licenses.json b/cargo/licenses.json index f41752321..9cbe8243a 100644 --- a/cargo/licenses.json +++ b/cargo/licenses.json @@ -55,7 +55,7 @@ }, { "name": "anyhow", - "version": "1.0.35", + "version": "1.0.37", "authors": "David Tolnay ", "repository": "https://github.com/dtolnay/anyhow", "license": "Apache-2.0 OR MIT", @@ -136,7 +136,7 @@ }, { "name": "async-compression", - "version": "0.3.6", + "version": "0.3.7", "authors": "Wim Looman |Allen Bui ", "repository": "https://github.com/Nemo157/async-compression", "license": "Apache-2.0 OR MIT", @@ -260,6 +260,15 @@ "license_file": null, "description": "Types and traits for working with bytes" }, + { + "name": "bytes", + "version": "1.0.0", + "authors": "Carl Lerche |Sean McArthur ", + "repository": "https://github.com/tokio-rs/bytes", + "license": "MIT", + "license_file": null, + "description": "Types and traits for working with bytes" + }, { "name": "cc", "version": "1.0.66", @@ -379,7 +388,7 @@ }, { "name": "ctor", - "version": "0.1.16", + "version": "0.1.17", "authors": "Matt Mastracci ", "repository": "https://github.com/mmastrac/rust-ctor", "license": "Apache-2.0 OR MIT", @@ -424,7 +433,7 @@ }, { "name": "dtoa", - "version": "0.4.6", + "version": "0.4.7", "authors": "David Tolnay ", "repository": "https://github.com/dtolnay/dtoa", "license": "Apache-2.0 OR MIT", @@ -604,7 +613,7 @@ }, { "name": "funty", - "version": "1.0.1", + "version": "1.1.0", "authors": "myrrlyn ", "repository": "https://github.com/myrrlyn/funty", "license": "MIT", @@ -766,7 +775,7 @@ }, { "name": "heck", - "version": "0.3.1", + "version": "0.3.2", "authors": "Without Boats ", "repository": "https://github.com/withoutboats/heck", "license": "Apache-2.0 OR MIT", @@ -991,7 +1000,7 @@ }, { "name": "itoa", - "version": "0.4.6", + "version": "0.4.7", "authors": "David Tolnay ", "repository": "https://github.com/dtolnay/itoa", "license": "Apache-2.0 OR MIT", @@ -1153,7 +1162,7 @@ }, { "name": "native-tls", - "version": "0.2.6", + "version": "0.2.7", "authors": "Steven Fackler ", "repository": "https://github.com/sfackler/rust-native-tls", "license": "Apache-2.0 OR MIT", @@ -1261,7 +1270,7 @@ }, { "name": "openssl", - "version": "0.10.31", + "version": "0.10.32", "authors": "Steven Fackler ", "repository": "https://github.com/sfackler/rust-openssl", "license": "Apache-2.0", @@ -1279,7 +1288,7 @@ }, { "name": "openssl-sys", - "version": "0.9.59", + "version": "0.9.60", "authors": "Alex Crichton |Steven Fackler ", "repository": "https://github.com/sfackler/rust-openssl", "license": "MIT", @@ -1297,7 +1306,7 @@ }, { "name": "parking_lot_core", - "version": "0.8.1", + "version": "0.8.2", "authors": "Amanieu d'Antras ", "repository": "https://github.com/Amanieu/parking_lot", "license": "Apache-2.0 OR MIT", @@ -1459,7 +1468,7 @@ }, { "name": "prost", - "version": "0.6.1", + "version": "0.7.0", "authors": "Dan Burkert ", "repository": "https://github.com/danburkert/prost", "license": "Apache-2.0", @@ -1468,7 +1477,7 @@ }, { "name": "prost-build", - "version": "0.6.1", + "version": "0.7.0", "authors": "Dan Burkert ", "repository": "https://github.com/danburkert/prost", "license": "Apache-2.0", @@ -1477,7 +1486,7 @@ }, { "name": "prost-derive", - "version": "0.6.1", + "version": "0.7.0", "authors": "Dan Burkert ", "repository": "https://github.com/danburkert/prost", "license": "Apache-2.0", @@ -1486,7 +1495,7 @@ }, { "name": "prost-types", - "version": "0.6.1", + "version": "0.7.0", "authors": "Dan Burkert ", "repository": "https://github.com/danburkert/prost", "license": "Apache-2.0", @@ -1495,7 +1504,7 @@ }, { "name": "pyo3", - "version": "0.12.4", + "version": "0.13.0", "authors": "PyO3 Project and Contributors ", "repository": "https://github.com/pyo3/pyo3", "license": "Apache-2.0", @@ -1503,26 +1512,26 @@ "description": "Bindings to Python interpreter" }, { - "name": "pyo3-derive-backend", - "version": "0.12.4", - "authors": "PyO3 Project and Contributors ", - "repository": "https://github.com/pyo3/pyo3", - "license": "Apache-2.0", - "license_file": null, - "description": "Code generation for PyO3 package" - }, - { - "name": "pyo3cls", - "version": "0.12.4", + "name": "pyo3-macros", + "version": "0.13.0", "authors": "PyO3 Project and Contributors ", "repository": "https://github.com/pyo3/pyo3", "license": "Apache-2.0", "license_file": null, "description": "Proc macros for PyO3 package" }, + { + "name": "pyo3-macros-backend", + "version": "0.13.0", + "authors": "PyO3 Project and Contributors ", + "repository": "https://github.com/pyo3/pyo3", + "license": "Apache-2.0", + "license_file": null, + "description": "Code generation for PyO3 package" + }, { "name": "quote", - "version": "1.0.7", + "version": "1.0.8", "authors": "David Tolnay ", "repository": "https://github.com/dtolnay/quote", "license": "Apache-2.0 OR MIT", @@ -1783,7 +1792,7 @@ }, { "name": "serde_json", - "version": "1.0.60", + "version": "1.0.61", "authors": "Erick Tryzelaar |David Tolnay ", "repository": "https://github.com/serde-rs/json", "license": "Apache-2.0 OR MIT", @@ -1909,7 +1918,7 @@ }, { "name": "socket2", - "version": "0.3.18", + "version": "0.3.19", "authors": "Alex Crichton ", "repository": "https://github.com/alexcrichton/socket2-rs", "license": "Apache-2.0 OR MIT", @@ -1954,7 +1963,7 @@ }, { "name": "syn", - "version": "1.0.54", + "version": "1.0.56", "authors": "David Tolnay ", "repository": "https://github.com/dtolnay/syn", "license": "Apache-2.0 OR MIT", @@ -2017,7 +2026,7 @@ }, { "name": "thiserror", - "version": "1.0.22", + "version": "1.0.23", "authors": "David Tolnay ", "repository": "https://github.com/dtolnay/thiserror", "license": "Apache-2.0 OR MIT", @@ -2026,7 +2035,7 @@ }, { "name": "thiserror-impl", - "version": "1.0.22", + "version": "1.0.23", "authors": "David Tolnay ", "repository": "https://github.com/dtolnay/thiserror", "license": "Apache-2.0 OR MIT", @@ -2134,7 +2143,7 @@ }, { "name": "toml", - "version": "0.5.7", + "version": "0.5.8", "authors": "Alex Crichton ", "repository": "https://github.com/alexcrichton/toml-rs", "license": "Apache-2.0 OR MIT", diff --git a/cargo/remote/BUILD.anyhow-1.0.35.bazel b/cargo/remote/BUILD.anyhow-1.0.37.bazel similarity index 95% rename from cargo/remote/BUILD.anyhow-1.0.35.bazel rename to cargo/remote/BUILD.anyhow-1.0.37.bazel index d60beffdc..1715649c7 100644 --- a/cargo/remote/BUILD.anyhow-1.0.35.bazel +++ b/cargo/remote/BUILD.anyhow-1.0.37.bazel @@ -54,7 +54,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "1.0.35", + version = "1.0.37", visibility = ["//visibility:private"], deps = [ ], @@ -78,7 +78,7 @@ rust_library( "cargo-raze", "manual", ], - version = "1.0.35", + version = "1.0.37", # buildifier: leave-alone deps = [ ":anyhow_build_script", @@ -101,6 +101,8 @@ rust_library( # Unsupported target "test_downcast" with type "test" omitted +# Unsupported target "test_ffi" with type "test" omitted + # Unsupported target "test_fmt" with type "test" omitted # Unsupported target "test_macros" with type "test" omitted diff --git a/cargo/remote/BUILD.askama_derive-0.10.5.bazel b/cargo/remote/BUILD.askama_derive-0.10.5.bazel index 80e48b0ab..d490a806a 100644 --- a/cargo/remote/BUILD.askama_derive-0.10.5.bazel +++ b/cargo/remote/BUILD.askama_derive-0.10.5.bazel @@ -51,6 +51,6 @@ rust_library( deps = [ "@raze__askama_shared__0_11_1//:askama_shared", "@raze__proc_macro2__1_0_24//:proc_macro2", - "@raze__syn__1_0_54//:syn", + "@raze__syn__1_0_56//:syn", ], ) diff --git a/cargo/remote/BUILD.askama_shared-0.11.1.bazel b/cargo/remote/BUILD.askama_shared-0.11.1.bazel index 7a6c2f219..6e75c0a0a 100644 --- a/cargo/remote/BUILD.askama_shared-0.11.1.bazel +++ b/cargo/remote/BUILD.askama_shared-0.11.1.bazel @@ -61,9 +61,9 @@ rust_library( "@raze__num_traits__0_2_14//:num_traits", "@raze__percent_encoding__2_1_0//:percent_encoding", "@raze__proc_macro2__1_0_24//:proc_macro2", - "@raze__quote__1_0_7//:quote", + "@raze__quote__1_0_8//:quote", "@raze__serde__1_0_118//:serde", - "@raze__syn__1_0_54//:syn", - "@raze__toml__0_5_7//:toml", + "@raze__syn__1_0_56//:syn", + "@raze__toml__0_5_8//:toml", ], ) diff --git a/cargo/remote/BUILD.async-compression-0.3.6.bazel b/cargo/remote/BUILD.async-compression-0.3.7.bazel similarity index 91% rename from cargo/remote/BUILD.async-compression-0.3.6.bazel rename to cargo/remote/BUILD.async-compression-0.3.7.bazel index 7f39a3d0f..8eed63c0d 100644 --- a/cargo/remote/BUILD.async-compression-0.3.6.bazel +++ b/cargo/remote/BUILD.async-compression-0.3.7.bazel @@ -37,8 +37,11 @@ licenses([ rust_library( name = "async_compression", srcs = glob(["**/*.rs"]), + aliases = { + "@raze__bytes__0_5_6//:bytes": "bytes_05", + }, crate_features = [ - "bytes", + "bytes-05", "default", "flate2", "gzip", @@ -55,14 +58,14 @@ rust_library( "cargo-raze", "manual", ], - version = "0.3.6", + version = "0.3.7", # buildifier: leave-alone deps = [ "@raze__bytes__0_5_6//:bytes", "@raze__flate2__1_0_19//:flate2", "@raze__futures_core__0_3_8//:futures_core", "@raze__memchr__2_3_4//:memchr", - "@raze__pin_project_lite__0_1_11//:pin_project_lite", + "@raze__pin_project_lite__0_2_0//:pin_project_lite", ], ) diff --git a/cargo/remote/BUILD.atty-0.2.14.bazel b/cargo/remote/BUILD.atty-0.2.14.bazel index 8af473784..06e76b95a 100644 --- a/cargo/remote/BUILD.atty-0.2.14.bazel +++ b/cargo/remote/BUILD.atty-0.2.14.bazel @@ -57,6 +57,7 @@ rust_library( # cfg(unix) ( "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", diff --git a/cargo/remote/BUILD.bitvec-0.19.4.bazel b/cargo/remote/BUILD.bitvec-0.19.4.bazel index 28d26061c..740e1495f 100644 --- a/cargo/remote/BUILD.bitvec-0.19.4.bazel +++ b/cargo/remote/BUILD.bitvec-0.19.4.bazel @@ -57,7 +57,7 @@ rust_library( version = "0.19.4", # buildifier: leave-alone deps = [ - "@raze__funty__1_0_1//:funty", + "@raze__funty__1_1_0//:funty", "@raze__radium__0_5_3//:radium", "@raze__tap__1_0_0//:tap", "@raze__wyz__0_2_0//:wyz", diff --git a/cargo/remote/BUILD.bytes-1.0.0.bazel b/cargo/remote/BUILD.bytes-1.0.0.bazel new file mode 100644 index 000000000..6a780ca4d --- /dev/null +++ b/cargo/remote/BUILD.bytes-1.0.0.bazel @@ -0,0 +1,81 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load( + "@io_bazel_rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT" +]) + +# Generated Targets + +# Unsupported target "buf" with type "bench" omitted + +# Unsupported target "bytes" with type "bench" omitted + +# Unsupported target "bytes_mut" with type "bench" omitted + +rust_library( + name = "bytes", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + crate_type = "lib", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "1.0.0", + # buildifier: leave-alone + deps = [ + ], +) + +# Unsupported target "test_buf" with type "test" omitted + +# Unsupported target "test_buf_mut" with type "test" omitted + +# Unsupported target "test_bytes" with type "test" omitted + +# Unsupported target "test_bytes_odd_alloc" with type "test" omitted + +# Unsupported target "test_bytes_vec_alloc" with type "test" omitted + +# Unsupported target "test_chain" with type "test" omitted + +# Unsupported target "test_debug" with type "test" omitted + +# Unsupported target "test_iter" with type "test" omitted + +# Unsupported target "test_reader" with type "test" omitted + +# Unsupported target "test_serde" with type "test" omitted + +# Unsupported target "test_take" with type "test" omitted diff --git a/cargo/remote/BUILD.coarsetime-0.1.18.bazel b/cargo/remote/BUILD.coarsetime-0.1.18.bazel index 1ae7c2da4..b83b1d001 100644 --- a/cargo/remote/BUILD.coarsetime-0.1.18.bazel +++ b/cargo/remote/BUILD.coarsetime-0.1.18.bazel @@ -56,6 +56,7 @@ rust_library( # cfg(not(target_os = "wasi")) ( "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", "@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc", diff --git a/cargo/remote/BUILD.ctor-0.1.16.bazel b/cargo/remote/BUILD.ctor-0.1.17.bazel similarity index 91% rename from cargo/remote/BUILD.ctor-0.1.16.bazel rename to cargo/remote/BUILD.ctor-0.1.17.bazel index 9de79bfef..8b263b1fa 100644 --- a/cargo/remote/BUILD.ctor-0.1.16.bazel +++ b/cargo/remote/BUILD.ctor-0.1.17.bazel @@ -48,10 +48,10 @@ rust_library( "cargo-raze", "manual", ], - version = "0.1.16", + version = "0.1.17", # buildifier: leave-alone deps = [ - "@raze__quote__1_0_7//:quote", - "@raze__syn__1_0_54//:syn", + "@raze__quote__1_0_8//:quote", + "@raze__syn__1_0_56//:syn", ], ) diff --git a/cargo/remote/BUILD.derivative-2.1.1.bazel b/cargo/remote/BUILD.derivative-2.1.1.bazel index 70dc771c1..8925cd7cf 100644 --- a/cargo/remote/BUILD.derivative-2.1.1.bazel +++ b/cargo/remote/BUILD.derivative-2.1.1.bazel @@ -51,8 +51,8 @@ rust_library( # buildifier: leave-alone deps = [ "@raze__proc_macro2__1_0_24//:proc_macro2", - "@raze__quote__1_0_7//:quote", - "@raze__syn__1_0_54//:syn", + "@raze__quote__1_0_8//:quote", + "@raze__syn__1_0_56//:syn", ], ) diff --git a/cargo/remote/BUILD.dirs-sys-0.3.5.bazel b/cargo/remote/BUILD.dirs-sys-0.3.5.bazel index 865047207..b37e12ee4 100644 --- a/cargo/remote/BUILD.dirs-sys-0.3.5.bazel +++ b/cargo/remote/BUILD.dirs-sys-0.3.5.bazel @@ -55,6 +55,7 @@ rust_library( # cfg(unix) ( "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", diff --git a/cargo/remote/BUILD.dtoa-0.4.6.bazel b/cargo/remote/BUILD.dtoa-0.4.7.bazel similarity index 97% rename from cargo/remote/BUILD.dtoa-0.4.6.bazel rename to cargo/remote/BUILD.dtoa-0.4.7.bazel index 4addd09b1..e988b582d 100644 --- a/cargo/remote/BUILD.dtoa-0.4.6.bazel +++ b/cargo/remote/BUILD.dtoa-0.4.7.bazel @@ -48,7 +48,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.4.6", + version = "0.4.7", # buildifier: leave-alone deps = [ ], diff --git a/cargo/remote/BUILD.failure_derive-0.1.8.bazel b/cargo/remote/BUILD.failure_derive-0.1.8.bazel index 7ff845f25..6095fea55 100644 --- a/cargo/remote/BUILD.failure_derive-0.1.8.bazel +++ b/cargo/remote/BUILD.failure_derive-0.1.8.bazel @@ -79,8 +79,8 @@ rust_library( deps = [ ":failure_derive_build_script", "@raze__proc_macro2__1_0_24//:proc_macro2", - "@raze__quote__1_0_7//:quote", - "@raze__syn__1_0_54//:syn", + "@raze__quote__1_0_8//:quote", + "@raze__syn__1_0_56//:syn", "@raze__synstructure__0_12_4//:synstructure", ], ) diff --git a/cargo/remote/BUILD.funty-1.0.1.bazel b/cargo/remote/BUILD.funty-1.1.0.bazel similarity index 97% rename from cargo/remote/BUILD.funty-1.0.1.bazel rename to cargo/remote/BUILD.funty-1.1.0.bazel index f821f2a80..06c2831df 100644 --- a/cargo/remote/BUILD.funty-1.0.1.bazel +++ b/cargo/remote/BUILD.funty-1.1.0.bazel @@ -46,7 +46,7 @@ rust_library( "cargo-raze", "manual", ], - version = "1.0.1", + version = "1.1.0", # buildifier: leave-alone deps = [ ], diff --git a/cargo/remote/BUILD.futures-macro-0.3.8.bazel b/cargo/remote/BUILD.futures-macro-0.3.8.bazel index 55406b6b7..d6860c6bb 100644 --- a/cargo/remote/BUILD.futures-macro-0.3.8.bazel +++ b/cargo/remote/BUILD.futures-macro-0.3.8.bazel @@ -53,7 +53,7 @@ rust_library( # buildifier: leave-alone deps = [ "@raze__proc_macro2__1_0_24//:proc_macro2", - "@raze__quote__1_0_7//:quote", - "@raze__syn__1_0_54//:syn", + "@raze__quote__1_0_8//:quote", + "@raze__syn__1_0_56//:syn", ], ) diff --git a/cargo/remote/BUILD.getrandom-0.1.15.bazel b/cargo/remote/BUILD.getrandom-0.1.15.bazel index 6a7eefbb7..321f4e9dd 100644 --- a/cargo/remote/BUILD.getrandom-0.1.15.bazel +++ b/cargo/remote/BUILD.getrandom-0.1.15.bazel @@ -60,6 +60,7 @@ cargo_build_script( # cfg(unix) ( "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", @@ -99,6 +100,7 @@ rust_library( # cfg(unix) ( "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", diff --git a/cargo/remote/BUILD.ghost-0.1.2.bazel b/cargo/remote/BUILD.ghost-0.1.2.bazel index da4516c1f..e1a90107c 100644 --- a/cargo/remote/BUILD.ghost-0.1.2.bazel +++ b/cargo/remote/BUILD.ghost-0.1.2.bazel @@ -50,7 +50,7 @@ rust_library( # buildifier: leave-alone deps = [ "@raze__proc_macro2__1_0_24//:proc_macro2", - "@raze__quote__1_0_7//:quote", - "@raze__syn__1_0_54//:syn", + "@raze__quote__1_0_8//:quote", + "@raze__syn__1_0_56//:syn", ], ) diff --git a/cargo/remote/BUILD.heck-0.3.1.bazel b/cargo/remote/BUILD.heck-0.3.2.bazel similarity index 95% rename from cargo/remote/BUILD.heck-0.3.1.bazel rename to cargo/remote/BUILD.heck-0.3.2.bazel index 725be3d72..f982a953e 100644 --- a/cargo/remote/BUILD.heck-0.3.1.bazel +++ b/cargo/remote/BUILD.heck-0.3.2.bazel @@ -38,7 +38,7 @@ rust_library( crate_root = "src/lib.rs", crate_type = "lib", data = [], - edition = "2015", + edition = "2018", rustc_flags = [ "--cap-lints=allow", ], @@ -46,7 +46,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.3.1", + version = "0.3.2", # buildifier: leave-alone deps = [ "@raze__unicode_segmentation__1_7_1//:unicode_segmentation", diff --git a/cargo/remote/BUILD.http-0.2.2.bazel b/cargo/remote/BUILD.http-0.2.2.bazel index 76badbc96..22c878752 100644 --- a/cargo/remote/BUILD.http-0.2.2.bazel +++ b/cargo/remote/BUILD.http-0.2.2.bazel @@ -59,7 +59,7 @@ rust_library( deps = [ "@raze__bytes__0_5_6//:bytes", "@raze__fnv__1_0_7//:fnv", - "@raze__itoa__0_4_6//:itoa", + "@raze__itoa__0_4_7//:itoa", ], ) diff --git a/cargo/remote/BUILD.hyper-0.13.9.bazel b/cargo/remote/BUILD.hyper-0.13.9.bazel index 97e8ccacb..75cc2c2f0 100644 --- a/cargo/remote/BUILD.hyper-0.13.9.bazel +++ b/cargo/remote/BUILD.hyper-0.13.9.bazel @@ -104,9 +104,9 @@ rust_library( "@raze__http_body__0_3_1//:http_body", "@raze__httparse__1_3_4//:httparse", "@raze__httpdate__0_3_2//:httpdate", - "@raze__itoa__0_4_6//:itoa", + "@raze__itoa__0_4_7//:itoa", "@raze__pin_project__1_0_2//:pin_project", - "@raze__socket2__0_3_18//:socket2", + "@raze__socket2__0_3_19//:socket2", "@raze__tokio__0_2_24//:tokio", "@raze__tower_service__0_3_0//:tower_service", "@raze__tracing__0_1_22//:tracing", @@ -114,6 +114,7 @@ rust_library( ] + selects.with_or({ # cfg(any(target_os = "linux", target_os = "macos")) ( + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ diff --git a/cargo/remote/BUILD.hyper-tls-0.4.3.bazel b/cargo/remote/BUILD.hyper-tls-0.4.3.bazel index b2f1b0f8b..e0b0a833c 100644 --- a/cargo/remote/BUILD.hyper-tls-0.4.3.bazel +++ b/cargo/remote/BUILD.hyper-tls-0.4.3.bazel @@ -53,7 +53,7 @@ rust_library( deps = [ "@raze__bytes__0_5_6//:bytes", "@raze__hyper__0_13_9//:hyper", - "@raze__native_tls__0_2_6//:native_tls", + "@raze__native_tls__0_2_7//:native_tls", "@raze__tokio__0_2_24//:tokio", "@raze__tokio_tls__0_3_1//:tokio_tls", ], diff --git a/cargo/remote/BUILD.inventory-0.1.10.bazel b/cargo/remote/BUILD.inventory-0.1.10.bazel index ce7cc9d15..6bc2253cf 100644 --- a/cargo/remote/BUILD.inventory-0.1.10.bazel +++ b/cargo/remote/BUILD.inventory-0.1.10.bazel @@ -70,7 +70,7 @@ rust_library( data = [], edition = "2018", proc_macro_deps = [ - "@raze__ctor__0_1_16//:ctor", + "@raze__ctor__0_1_17//:ctor", "@raze__ghost__0_1_2//:ghost", "@raze__inventory_impl__0_1_10//:inventory_impl", ], diff --git a/cargo/remote/BUILD.inventory-impl-0.1.10.bazel b/cargo/remote/BUILD.inventory-impl-0.1.10.bazel index 3c0740e22..ab4bef251 100644 --- a/cargo/remote/BUILD.inventory-impl-0.1.10.bazel +++ b/cargo/remote/BUILD.inventory-impl-0.1.10.bazel @@ -50,7 +50,7 @@ rust_library( # buildifier: leave-alone deps = [ "@raze__proc_macro2__1_0_24//:proc_macro2", - "@raze__quote__1_0_7//:quote", - "@raze__syn__1_0_54//:syn", + "@raze__quote__1_0_8//:quote", + "@raze__syn__1_0_56//:syn", ], ) diff --git a/cargo/remote/BUILD.iovec-0.1.4.bazel b/cargo/remote/BUILD.iovec-0.1.4.bazel index 23174c6cc..2e4c47cb2 100644 --- a/cargo/remote/BUILD.iovec-0.1.4.bazel +++ b/cargo/remote/BUILD.iovec-0.1.4.bazel @@ -55,6 +55,7 @@ rust_library( # cfg(unix) ( "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", diff --git a/cargo/remote/BUILD.itoa-0.4.6.bazel b/cargo/remote/BUILD.itoa-0.4.7.bazel similarity index 98% rename from cargo/remote/BUILD.itoa-0.4.6.bazel rename to cargo/remote/BUILD.itoa-0.4.7.bazel index 00565f2f8..9b0f6562d 100644 --- a/cargo/remote/BUILD.itoa-0.4.6.bazel +++ b/cargo/remote/BUILD.itoa-0.4.7.bazel @@ -51,7 +51,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.4.6", + version = "0.4.7", # buildifier: leave-alone deps = [ ], diff --git a/cargo/remote/BUILD.mio-0.6.23.bazel b/cargo/remote/BUILD.mio-0.6.23.bazel index 3e1fc39ee..5b0abceca 100644 --- a/cargo/remote/BUILD.mio-0.6.23.bazel +++ b/cargo/remote/BUILD.mio-0.6.23.bazel @@ -62,6 +62,7 @@ rust_library( # cfg(unix) ( "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", diff --git a/cargo/remote/BUILD.native-tls-0.2.6.bazel b/cargo/remote/BUILD.native-tls-0.2.7.bazel similarity index 91% rename from cargo/remote/BUILD.native-tls-0.2.6.bazel rename to cargo/remote/BUILD.native-tls-0.2.7.bazel index 90faa77c6..e710517c0 100644 --- a/cargo/remote/BUILD.native-tls-0.2.6.bazel +++ b/cargo/remote/BUILD.native-tls-0.2.7.bazel @@ -52,7 +52,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.2.6", + version = "0.2.7", visibility = ["//visibility:private"], deps = [ ] + selects.with_or({ @@ -68,9 +68,10 @@ cargo_build_script( }) + selects.with_or({ # cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios"))) ( + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__openssl_sys__0_9_59//:openssl_sys", + "@raze__openssl_sys__0_9_60//:openssl_sys", ], "//conditions:default": [], }) + selects.with_or({ @@ -105,7 +106,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.2.6", + version = "0.2.7", # buildifier: leave-alone deps = [ ":native_tls_build_script", @@ -126,12 +127,13 @@ rust_library( }) + selects.with_or({ # cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios"))) ( + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ "@raze__log__0_4_11//:log", - "@raze__openssl__0_10_31//:openssl", + "@raze__openssl__0_10_32//:openssl", "@raze__openssl_probe__0_1_2//:openssl_probe", - "@raze__openssl_sys__0_9_59//:openssl_sys", + "@raze__openssl_sys__0_9_60//:openssl_sys", ], "//conditions:default": [], }) + selects.with_or({ diff --git a/cargo/remote/BUILD.net2-0.2.37.bazel b/cargo/remote/BUILD.net2-0.2.37.bazel index 4aad30b57..8f2fc4801 100644 --- a/cargo/remote/BUILD.net2-0.2.37.bazel +++ b/cargo/remote/BUILD.net2-0.2.37.bazel @@ -58,6 +58,7 @@ rust_library( # cfg(any(target_os = "redox", unix, target_os = "wasi")) ( "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", diff --git a/cargo/remote/BUILD.num-format-0.4.0.bazel b/cargo/remote/BUILD.num-format-0.4.0.bazel index 205f45d61..3fc6e1b34 100644 --- a/cargo/remote/BUILD.num-format-0.4.0.bazel +++ b/cargo/remote/BUILD.num-format-0.4.0.bazel @@ -54,11 +54,12 @@ rust_library( # buildifier: leave-alone deps = [ "@raze__arrayvec__0_4_12//:arrayvec", - "@raze__itoa__0_4_6//:itoa", + "@raze__itoa__0_4_7//:itoa", ] + selects.with_or({ # cfg(unix) ( "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", diff --git a/cargo/remote/BUILD.num_enum_derive-0.5.1.bazel b/cargo/remote/BUILD.num_enum_derive-0.5.1.bazel index 5e8546ed0..9440a411a 100644 --- a/cargo/remote/BUILD.num_enum_derive-0.5.1.bazel +++ b/cargo/remote/BUILD.num_enum_derive-0.5.1.bazel @@ -53,7 +53,7 @@ rust_library( deps = [ "@raze__proc_macro2__1_0_24//:proc_macro2", "@raze__proc_macro_crate__0_1_5//:proc_macro_crate", - "@raze__quote__1_0_7//:quote", - "@raze__syn__1_0_54//:syn", + "@raze__quote__1_0_8//:quote", + "@raze__syn__1_0_56//:syn", ], ) diff --git a/cargo/remote/BUILD.openssl-0.10.31.bazel b/cargo/remote/BUILD.openssl-0.10.32.bazel similarity index 92% rename from cargo/remote/BUILD.openssl-0.10.31.bazel rename to cargo/remote/BUILD.openssl-0.10.32.bazel index aa44c9f1a..b61c0fee7 100644 --- a/cargo/remote/BUILD.openssl-0.10.31.bazel +++ b/cargo/remote/BUILD.openssl-0.10.32.bazel @@ -52,10 +52,10 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.10.31", + version = "0.10.32", visibility = ["//visibility:private"], deps = [ - "@raze__openssl_sys__0_9_59//:openssl_sys", + "@raze__openssl_sys__0_9_60//:openssl_sys", ], ) @@ -77,7 +77,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.10.31", + version = "0.10.32", # buildifier: leave-alone deps = [ ":openssl_build_script", @@ -86,6 +86,6 @@ rust_library( "@raze__foreign_types__0_3_2//:foreign_types", "@raze__lazy_static__1_4_0//:lazy_static", "@raze__libc__0_2_81//:libc", - "@raze__openssl_sys__0_9_59//:openssl_sys", + "@raze__openssl_sys__0_9_60//:openssl_sys", ], ) diff --git a/cargo/remote/BUILD.openssl-sys-0.9.59.bazel b/cargo/remote/BUILD.openssl-sys-0.9.60.bazel similarity index 97% rename from cargo/remote/BUILD.openssl-sys-0.9.59.bazel rename to cargo/remote/BUILD.openssl-sys-0.9.60.bazel index 176b12571..6383aacbc 100644 --- a/cargo/remote/BUILD.openssl-sys-0.9.59.bazel +++ b/cargo/remote/BUILD.openssl-sys-0.9.60.bazel @@ -52,7 +52,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.9.59", + version = "0.9.60", visibility = ["//visibility:private"], deps = [ "@raze__autocfg__1_0_1//:autocfg", @@ -87,7 +87,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.9.59", + version = "0.9.60", # buildifier: leave-alone deps = [ ":openssl_sys_build_script", diff --git a/cargo/remote/BUILD.parking_lot-0.11.1.bazel b/cargo/remote/BUILD.parking_lot-0.11.1.bazel index 9caa438d4..89ea3c351 100644 --- a/cargo/remote/BUILD.parking_lot-0.11.1.bazel +++ b/cargo/remote/BUILD.parking_lot-0.11.1.bazel @@ -52,7 +52,7 @@ rust_library( deps = [ "@raze__instant__0_1_9//:instant", "@raze__lock_api__0_4_2//:lock_api", - "@raze__parking_lot_core__0_8_1//:parking_lot_core", + "@raze__parking_lot_core__0_8_2//:parking_lot_core", ], ) diff --git a/cargo/remote/BUILD.parking_lot_core-0.8.1.bazel b/cargo/remote/BUILD.parking_lot_core-0.8.2.bazel similarity index 94% rename from cargo/remote/BUILD.parking_lot_core-0.8.1.bazel rename to cargo/remote/BUILD.parking_lot_core-0.8.2.bazel index c54752643..3586b08aa 100644 --- a/cargo/remote/BUILD.parking_lot_core-0.8.1.bazel +++ b/cargo/remote/BUILD.parking_lot_core-0.8.2.bazel @@ -48,7 +48,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.8.1", + version = "0.8.2", # buildifier: leave-alone deps = [ "@raze__cfg_if__1_0_0//:cfg_if", @@ -58,6 +58,7 @@ rust_library( # cfg(unix) ( "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", diff --git a/cargo/remote/BUILD.pin-project-internal-0.4.27.bazel b/cargo/remote/BUILD.pin-project-internal-0.4.27.bazel index bb3efd253..9092e198f 100644 --- a/cargo/remote/BUILD.pin-project-internal-0.4.27.bazel +++ b/cargo/remote/BUILD.pin-project-internal-0.4.27.bazel @@ -79,7 +79,7 @@ rust_library( deps = [ ":pin_project_internal_build_script", "@raze__proc_macro2__1_0_24//:proc_macro2", - "@raze__quote__1_0_7//:quote", - "@raze__syn__1_0_54//:syn", + "@raze__quote__1_0_8//:quote", + "@raze__syn__1_0_56//:syn", ], ) diff --git a/cargo/remote/BUILD.pin-project-internal-1.0.2.bazel b/cargo/remote/BUILD.pin-project-internal-1.0.2.bazel index b01095811..cc9cd9aae 100644 --- a/cargo/remote/BUILD.pin-project-internal-1.0.2.bazel +++ b/cargo/remote/BUILD.pin-project-internal-1.0.2.bazel @@ -50,7 +50,7 @@ rust_library( # buildifier: leave-alone deps = [ "@raze__proc_macro2__1_0_24//:proc_macro2", - "@raze__quote__1_0_7//:quote", - "@raze__syn__1_0_54//:syn", + "@raze__quote__1_0_8//:quote", + "@raze__syn__1_0_56//:syn", ], ) diff --git a/cargo/remote/BUILD.proc-macro-crate-0.1.5.bazel b/cargo/remote/BUILD.proc-macro-crate-0.1.5.bazel index a9b6911d0..de761c9ec 100644 --- a/cargo/remote/BUILD.proc-macro-crate-0.1.5.bazel +++ b/cargo/remote/BUILD.proc-macro-crate-0.1.5.bazel @@ -49,6 +49,6 @@ rust_library( version = "0.1.5", # buildifier: leave-alone deps = [ - "@raze__toml__0_5_7//:toml", + "@raze__toml__0_5_8//:toml", ], ) diff --git a/cargo/remote/BUILD.prost-0.6.1.bazel b/cargo/remote/BUILD.prost-0.7.0.bazel similarity index 90% rename from cargo/remote/BUILD.prost-0.6.1.bazel rename to cargo/remote/BUILD.prost-0.7.0.bazel index c2767db8d..f1bc8649e 100644 --- a/cargo/remote/BUILD.prost-0.6.1.bazel +++ b/cargo/remote/BUILD.prost-0.7.0.bazel @@ -45,7 +45,7 @@ rust_library( data = [], edition = "2018", proc_macro_deps = [ - "@raze__prost_derive__0_6_1//:prost_derive", + "@raze__prost_derive__0_7_0//:prost_derive", ], rustc_flags = [ "--cap-lints=allow", @@ -54,9 +54,9 @@ rust_library( "cargo-raze", "manual", ], - version = "0.6.1", + version = "0.7.0", # buildifier: leave-alone deps = [ - "@raze__bytes__0_5_6//:bytes", + "@raze__bytes__1_0_0//:bytes", ], ) diff --git a/cargo/remote/BUILD.prost-build-0.6.1.bazel b/cargo/remote/BUILD.prost-build-0.7.0.bazel similarity index 85% rename from cargo/remote/BUILD.prost-build-0.6.1.bazel rename to cargo/remote/BUILD.prost-build-0.7.0.bazel index fa2fb29d8..4d40325e3 100644 --- a/cargo/remote/BUILD.prost-build-0.6.1.bazel +++ b/cargo/remote/BUILD.prost-build-0.7.0.bazel @@ -42,7 +42,7 @@ cargo_build_script( }, crate_features = [ ], - crate_root = "prost-build/build.rs", + crate_root = "build.rs", data = glob(["**"]), edition = "2018", rustc_flags = [ @@ -52,7 +52,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.6.1", + version = "0.7.0", visibility = ["//visibility:private"], deps = [ "@raze__which__4_0_2//:which", @@ -64,7 +64,7 @@ rust_library( srcs = glob(["**/*.rs"]), crate_features = [ ], - crate_root = "prost-build/src/lib.rs", + crate_root = "src/lib.rs", crate_type = "lib", data = [], edition = "2018", @@ -75,18 +75,18 @@ rust_library( "cargo-raze", "manual", ], - version = "0.6.1", + version = "0.7.0", # buildifier: leave-alone deps = [ ":prost_build_build_script", - "@raze__bytes__0_5_6//:bytes", - "@raze__heck__0_3_1//:heck", + "@raze__bytes__1_0_0//:bytes", + "@raze__heck__0_3_2//:heck", "@raze__itertools__0_9_0//:itertools", "@raze__log__0_4_11//:log", "@raze__multimap__0_8_2//:multimap", "@raze__petgraph__0_5_1//:petgraph", - "@raze__prost__0_6_1//:prost", - "@raze__prost_types__0_6_1//:prost_types", + "@raze__prost__0_7_0//:prost", + "@raze__prost_types__0_7_0//:prost_types", "@raze__tempfile__3_1_0//:tempfile", ], ) diff --git a/cargo/remote/BUILD.prost-derive-0.6.1.bazel b/cargo/remote/BUILD.prost-derive-0.7.0.bazel similarity index 85% rename from cargo/remote/BUILD.prost-derive-0.6.1.bazel rename to cargo/remote/BUILD.prost-derive-0.7.0.bazel index a1ab8d57b..16aa3f291 100644 --- a/cargo/remote/BUILD.prost-derive-0.6.1.bazel +++ b/cargo/remote/BUILD.prost-derive-0.7.0.bazel @@ -35,7 +35,7 @@ rust_library( srcs = glob(["**/*.rs"]), crate_features = [ ], - crate_root = "prost-derive/src/lib.rs", + crate_root = "src/lib.rs", crate_type = "proc-macro", data = [], edition = "2018", @@ -46,13 +46,13 @@ rust_library( "cargo-raze", "manual", ], - version = "0.6.1", + version = "0.7.0", # buildifier: leave-alone deps = [ - "@raze__anyhow__1_0_35//:anyhow", + "@raze__anyhow__1_0_37//:anyhow", "@raze__itertools__0_9_0//:itertools", "@raze__proc_macro2__1_0_24//:proc_macro2", - "@raze__quote__1_0_7//:quote", - "@raze__syn__1_0_54//:syn", + "@raze__quote__1_0_8//:quote", + "@raze__syn__1_0_56//:syn", ], ) diff --git a/cargo/remote/BUILD.prost-types-0.6.1.bazel b/cargo/remote/BUILD.prost-types-0.7.0.bazel similarity index 87% rename from cargo/remote/BUILD.prost-types-0.6.1.bazel rename to cargo/remote/BUILD.prost-types-0.7.0.bazel index 589a7f7e5..18196b24f 100644 --- a/cargo/remote/BUILD.prost-types-0.6.1.bazel +++ b/cargo/remote/BUILD.prost-types-0.7.0.bazel @@ -35,7 +35,7 @@ rust_library( srcs = glob(["**/*.rs"]), crate_features = [ ], - crate_root = "prost-types/src/lib.rs", + crate_root = "src/lib.rs", crate_type = "lib", data = [], edition = "2018", @@ -46,10 +46,10 @@ rust_library( "cargo-raze", "manual", ], - version = "0.6.1", + version = "0.7.0", # buildifier: leave-alone deps = [ - "@raze__bytes__0_5_6//:bytes", - "@raze__prost__0_6_1//:prost", + "@raze__bytes__1_0_0//:bytes", + "@raze__prost__0_7_0//:prost", ], ) diff --git a/cargo/remote/BUILD.pyo3-0.12.4.bazel b/cargo/remote/BUILD.pyo3-0.13.0.bazel similarity index 96% rename from cargo/remote/BUILD.pyo3-0.12.4.bazel rename to cargo/remote/BUILD.pyo3-0.13.0.bazel index 1a6878e8c..1dfd14aef 100644 --- a/cargo/remote/BUILD.pyo3-0.12.4.bazel +++ b/cargo/remote/BUILD.pyo3-0.13.0.bazel @@ -49,7 +49,7 @@ cargo_build_script( "inventory", "macros", "paste", - "pyo3cls", + "pyo3-macros", "unindent", ], crate_root = "build.rs", @@ -62,7 +62,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.12.4", + version = "0.13.0", visibility = ["//visibility:private"], deps = [ ], @@ -92,7 +92,7 @@ rust_library( "inventory", "macros", "paste", - "pyo3cls", + "pyo3-macros", "unindent", ], crate_root = "src/lib.rs", @@ -101,10 +101,10 @@ rust_library( compile_data = glob(["**/*.md"]), edition = "2018", proc_macro_deps = [ - "@raze__ctor__0_1_16//:ctor", + "@raze__ctor__0_1_17//:ctor", "@raze__indoc__1_0_3//:indoc", "@raze__paste__1_0_4//:paste", - "@raze__pyo3cls__0_12_4//:pyo3cls", + "@raze__pyo3_macros__0_13_0//:pyo3_macros", ], rustc_flags = [ "--cap-lints=allow", @@ -113,7 +113,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.12.4", + version = "0.13.0", # buildifier: leave-alone deps = [ ":pyo3_build_script", diff --git a/cargo/remote/BUILD.pyo3cls-0.12.4.bazel b/cargo/remote/BUILD.pyo3-macros-0.13.0.bazel similarity index 81% rename from cargo/remote/BUILD.pyo3cls-0.12.4.bazel rename to cargo/remote/BUILD.pyo3-macros-0.13.0.bazel index 5e65efba4..bbc3abe84 100644 --- a/cargo/remote/BUILD.pyo3cls-0.12.4.bazel +++ b/cargo/remote/BUILD.pyo3-macros-0.13.0.bazel @@ -31,11 +31,11 @@ licenses([ # Generated Targets rust_library( - name = "pyo3cls", + name = "pyo3_macros", srcs = glob(["**/*.rs"]), crate_features = [ ], - crate_root = "pyo3cls/src/lib.rs", + crate_root = "src/lib.rs", crate_type = "proc-macro", data = [], edition = "2018", @@ -46,11 +46,11 @@ rust_library( "cargo-raze", "manual", ], - version = "0.12.4", + version = "0.13.0", # buildifier: leave-alone deps = [ - "@raze__pyo3_derive_backend__0_12_4//:pyo3_derive_backend", - "@raze__quote__1_0_7//:quote", - "@raze__syn__1_0_54//:syn", + "@raze__pyo3_macros_backend__0_13_0//:pyo3_macros_backend", + "@raze__quote__1_0_8//:quote", + "@raze__syn__1_0_56//:syn", ], ) diff --git a/cargo/remote/BUILD.pyo3-derive-backend-0.12.4.bazel b/cargo/remote/BUILD.pyo3-macros-backend-0.13.0.bazel similarity index 84% rename from cargo/remote/BUILD.pyo3-derive-backend-0.12.4.bazel rename to cargo/remote/BUILD.pyo3-macros-backend-0.13.0.bazel index e0b52b24a..3fc640cfb 100644 --- a/cargo/remote/BUILD.pyo3-derive-backend-0.12.4.bazel +++ b/cargo/remote/BUILD.pyo3-macros-backend-0.13.0.bazel @@ -31,11 +31,11 @@ licenses([ # Generated Targets rust_library( - name = "pyo3_derive_backend", + name = "pyo3_macros_backend", srcs = glob(["**/*.rs"]), crate_features = [ ], - crate_root = "pyo3-derive-backend/src/lib.rs", + crate_root = "src/lib.rs", crate_type = "lib", data = [], edition = "2018", @@ -46,11 +46,11 @@ rust_library( "cargo-raze", "manual", ], - version = "0.12.4", + version = "0.13.0", # buildifier: leave-alone deps = [ "@raze__proc_macro2__1_0_24//:proc_macro2", - "@raze__quote__1_0_7//:quote", - "@raze__syn__1_0_54//:syn", + "@raze__quote__1_0_8//:quote", + "@raze__syn__1_0_56//:syn", ], ) diff --git a/cargo/remote/BUILD.quote-1.0.7.bazel b/cargo/remote/BUILD.quote-1.0.8.bazel similarity index 98% rename from cargo/remote/BUILD.quote-1.0.7.bazel rename to cargo/remote/BUILD.quote-1.0.8.bazel index e9b8e1fad..a3018c978 100644 --- a/cargo/remote/BUILD.quote-1.0.7.bazel +++ b/cargo/remote/BUILD.quote-1.0.8.bazel @@ -48,7 +48,7 @@ rust_library( "cargo-raze", "manual", ], - version = "1.0.7", + version = "1.0.8", # buildifier: leave-alone deps = [ "@raze__proc_macro2__1_0_24//:proc_macro2", diff --git a/cargo/remote/BUILD.rand-0.7.3.bazel b/cargo/remote/BUILD.rand-0.7.3.bazel index 11aa7bc97..c274e3ad6 100644 --- a/cargo/remote/BUILD.rand-0.7.3.bazel +++ b/cargo/remote/BUILD.rand-0.7.3.bazel @@ -77,6 +77,7 @@ rust_library( # cfg(unix) ( "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", diff --git a/cargo/remote/BUILD.rental-impl-0.5.5.bazel b/cargo/remote/BUILD.rental-impl-0.5.5.bazel index eaeb66526..e391ea9dd 100644 --- a/cargo/remote/BUILD.rental-impl-0.5.5.bazel +++ b/cargo/remote/BUILD.rental-impl-0.5.5.bazel @@ -50,7 +50,7 @@ rust_library( # buildifier: leave-alone deps = [ "@raze__proc_macro2__1_0_24//:proc_macro2", - "@raze__quote__1_0_7//:quote", - "@raze__syn__1_0_54//:syn", + "@raze__quote__1_0_8//:quote", + "@raze__syn__1_0_56//:syn", ], ) diff --git a/cargo/remote/BUILD.reqwest-0.10.8.bazel b/cargo/remote/BUILD.reqwest-0.10.8.bazel index 83d784d90..130f6fbc4 100644 --- a/cargo/remote/BUILD.reqwest-0.10.8.bazel +++ b/cargo/remote/BUILD.reqwest-0.10.8.bazel @@ -46,7 +46,7 @@ rust_library( name = "reqwest", srcs = glob(["**/*.rs"]), aliases = { - "@raze__native_tls__0_2_6//:native_tls": "native_tls_crate", + "@raze__native_tls__0_2_7//:native_tls": "native_tls_crate", }, crate_features = [ "__rustls", @@ -87,13 +87,14 @@ rust_library( "@raze__hyper_timeout__0_3_1//:hyper_timeout", "@raze__mime_guess__2_0_3//:mime_guess", "@raze__serde__1_0_118//:serde", - "@raze__serde_json__1_0_60//:serde_json", + "@raze__serde_json__1_0_61//:serde_json", "@raze__serde_urlencoded__0_6_1//:serde_urlencoded", "@raze__url__2_2_0//:url", ] + selects.with_or({ # cfg(not(target_arch = "wasm32")) ( "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", "@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc", @@ -111,7 +112,7 @@ rust_library( "@raze__lazy_static__1_4_0//:lazy_static", "@raze__log__0_4_11//:log", "@raze__mime__0_3_16//:mime", - "@raze__native_tls__0_2_6//:native_tls", + "@raze__native_tls__0_2_7//:native_tls", "@raze__percent_encoding__2_1_0//:percent_encoding", "@raze__pin_project_lite__0_1_11//:pin_project_lite", "@raze__rustls__0_18_1//:rustls", diff --git a/cargo/remote/BUILD.ring-0.16.19.bazel b/cargo/remote/BUILD.ring-0.16.19.bazel index 70675506e..4fae09e33 100644 --- a/cargo/remote/BUILD.ring-0.16.19.bazel +++ b/cargo/remote/BUILD.ring-0.16.19.bazel @@ -63,6 +63,7 @@ cargo_build_script( ] + selects.with_or({ # cfg(any(target_arch = "x86", target_arch = "x86_64", all(any(target_arch = "aarch64", target_arch = "arm"), any(target_os = "android", target_os = "fuchsia", target_os = "linux")))) ( + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", "@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc", @@ -73,6 +74,7 @@ cargo_build_script( }) + selects.with_or({ # cfg(any(target_os = "android", target_os = "linux")) ( + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ ], @@ -81,6 +83,7 @@ cargo_build_script( # cfg(any(unix, windows)) ( "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", "@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc", @@ -129,6 +132,7 @@ rust_library( ] + selects.with_or({ # cfg(any(target_arch = "x86", target_arch = "x86_64", all(any(target_arch = "aarch64", target_arch = "arm"), any(target_os = "android", target_os = "fuchsia", target_os = "linux")))) ( + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", "@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc", @@ -140,6 +144,7 @@ rust_library( }) + selects.with_or({ # cfg(any(target_os = "android", target_os = "linux")) ( + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ "@raze__libc__0_2_81//:libc", @@ -150,6 +155,7 @@ rust_library( # cfg(any(unix, windows)) ( "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", "@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc", diff --git a/cargo/remote/BUILD.serde-aux-0.6.1.bazel b/cargo/remote/BUILD.serde-aux-0.6.1.bazel index 9042c2038..c2cbeb400 100644 --- a/cargo/remote/BUILD.serde-aux-0.6.1.bazel +++ b/cargo/remote/BUILD.serde-aux-0.6.1.bazel @@ -56,6 +56,6 @@ rust_library( deps = [ "@raze__chrono__0_4_19//:chrono", "@raze__serde__1_0_118//:serde", - "@raze__serde_json__1_0_60//:serde_json", + "@raze__serde_json__1_0_61//:serde_json", ], ) diff --git a/cargo/remote/BUILD.serde_derive-1.0.118.bazel b/cargo/remote/BUILD.serde_derive-1.0.118.bazel index 9cfa5677a..b4fbcd746 100644 --- a/cargo/remote/BUILD.serde_derive-1.0.118.bazel +++ b/cargo/remote/BUILD.serde_derive-1.0.118.bazel @@ -81,7 +81,7 @@ rust_library( deps = [ ":serde_derive_build_script", "@raze__proc_macro2__1_0_24//:proc_macro2", - "@raze__quote__1_0_7//:quote", - "@raze__syn__1_0_54//:syn", + "@raze__quote__1_0_8//:quote", + "@raze__syn__1_0_56//:syn", ], ) diff --git a/cargo/remote/BUILD.serde_json-1.0.60.bazel b/cargo/remote/BUILD.serde_json-1.0.61.bazel similarity index 95% rename from cargo/remote/BUILD.serde_json-1.0.60.bazel rename to cargo/remote/BUILD.serde_json-1.0.61.bazel index d14bca756..ec262aca5 100644 --- a/cargo/remote/BUILD.serde_json-1.0.60.bazel +++ b/cargo/remote/BUILD.serde_json-1.0.61.bazel @@ -54,7 +54,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "1.0.60", + version = "1.0.61", visibility = ["//visibility:private"], deps = [ ], @@ -78,11 +78,11 @@ rust_library( "cargo-raze", "manual", ], - version = "1.0.60", + version = "1.0.61", # buildifier: leave-alone deps = [ ":serde_json_build_script", - "@raze__itoa__0_4_6//:itoa", + "@raze__itoa__0_4_7//:itoa", "@raze__ryu__1_0_5//:ryu", "@raze__serde__1_0_118//:serde", ], diff --git a/cargo/remote/BUILD.serde_repr-0.1.6.bazel b/cargo/remote/BUILD.serde_repr-0.1.6.bazel index 9cd257713..934536e14 100644 --- a/cargo/remote/BUILD.serde_repr-0.1.6.bazel +++ b/cargo/remote/BUILD.serde_repr-0.1.6.bazel @@ -50,8 +50,8 @@ rust_library( # buildifier: leave-alone deps = [ "@raze__proc_macro2__1_0_24//:proc_macro2", - "@raze__quote__1_0_7//:quote", - "@raze__syn__1_0_54//:syn", + "@raze__quote__1_0_8//:quote", + "@raze__syn__1_0_56//:syn", ], ) diff --git a/cargo/remote/BUILD.serde_tuple_macros-0.5.0.bazel b/cargo/remote/BUILD.serde_tuple_macros-0.5.0.bazel index b7bb789d8..a095ade99 100644 --- a/cargo/remote/BUILD.serde_tuple_macros-0.5.0.bazel +++ b/cargo/remote/BUILD.serde_tuple_macros-0.5.0.bazel @@ -50,7 +50,7 @@ rust_library( # buildifier: leave-alone deps = [ "@raze__proc_macro2__1_0_24//:proc_macro2", - "@raze__quote__1_0_7//:quote", - "@raze__syn__1_0_54//:syn", + "@raze__quote__1_0_8//:quote", + "@raze__syn__1_0_56//:syn", ], ) diff --git a/cargo/remote/BUILD.serde_urlencoded-0.6.1.bazel b/cargo/remote/BUILD.serde_urlencoded-0.6.1.bazel index 3d9ce000d..ef8e18eff 100644 --- a/cargo/remote/BUILD.serde_urlencoded-0.6.1.bazel +++ b/cargo/remote/BUILD.serde_urlencoded-0.6.1.bazel @@ -49,8 +49,8 @@ rust_library( version = "0.6.1", # buildifier: leave-alone deps = [ - "@raze__dtoa__0_4_6//:dtoa", - "@raze__itoa__0_4_6//:itoa", + "@raze__dtoa__0_4_7//:dtoa", + "@raze__itoa__0_4_7//:itoa", "@raze__serde__1_0_118//:serde", "@raze__url__2_2_0//:url", ], diff --git a/cargo/remote/BUILD.socket2-0.3.18.bazel b/cargo/remote/BUILD.socket2-0.3.19.bazel similarity index 94% rename from cargo/remote/BUILD.socket2-0.3.18.bazel rename to cargo/remote/BUILD.socket2-0.3.19.bazel index a260a6c5f..9f10d9931 100644 --- a/cargo/remote/BUILD.socket2-0.3.18.bazel +++ b/cargo/remote/BUILD.socket2-0.3.19.bazel @@ -48,13 +48,14 @@ rust_library( "cargo-raze", "manual", ], - version = "0.3.18", + version = "0.3.19", # buildifier: leave-alone deps = [ ] + selects.with_or({ # cfg(unix) ( "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", diff --git a/cargo/remote/BUILD.syn-1.0.54.bazel b/cargo/remote/BUILD.syn-1.0.56.bazel similarity index 97% rename from cargo/remote/BUILD.syn-1.0.54.bazel rename to cargo/remote/BUILD.syn-1.0.56.bazel index 9336ce05b..957affd49 100644 --- a/cargo/remote/BUILD.syn-1.0.54.bazel +++ b/cargo/remote/BUILD.syn-1.0.56.bazel @@ -64,7 +64,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "1.0.54", + version = "1.0.56", visibility = ["//visibility:private"], deps = [ ], @@ -102,12 +102,12 @@ rust_library( "cargo-raze", "manual", ], - version = "1.0.54", + version = "1.0.56", # buildifier: leave-alone deps = [ ":syn_build_script", "@raze__proc_macro2__1_0_24//:proc_macro2", - "@raze__quote__1_0_7//:quote", + "@raze__quote__1_0_8//:quote", "@raze__unicode_xid__0_2_1//:unicode_xid", ], ) diff --git a/cargo/remote/BUILD.synstructure-0.12.4.bazel b/cargo/remote/BUILD.synstructure-0.12.4.bazel index 6204e8672..a9eec1fd5 100644 --- a/cargo/remote/BUILD.synstructure-0.12.4.bazel +++ b/cargo/remote/BUILD.synstructure-0.12.4.bazel @@ -52,8 +52,8 @@ rust_library( # buildifier: leave-alone deps = [ "@raze__proc_macro2__1_0_24//:proc_macro2", - "@raze__quote__1_0_7//:quote", - "@raze__syn__1_0_54//:syn", + "@raze__quote__1_0_8//:quote", + "@raze__syn__1_0_56//:syn", "@raze__unicode_xid__0_2_1//:unicode_xid", ], ) diff --git a/cargo/remote/BUILD.tempfile-3.1.0.bazel b/cargo/remote/BUILD.tempfile-3.1.0.bazel index 7ca2c15b7..7cd3ab9f3 100644 --- a/cargo/remote/BUILD.tempfile-3.1.0.bazel +++ b/cargo/remote/BUILD.tempfile-3.1.0.bazel @@ -58,6 +58,7 @@ rust_library( # cfg(unix) ( "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", diff --git a/cargo/remote/BUILD.thiserror-1.0.22.bazel b/cargo/remote/BUILD.thiserror-1.0.23.bazel similarity index 95% rename from cargo/remote/BUILD.thiserror-1.0.22.bazel rename to cargo/remote/BUILD.thiserror-1.0.23.bazel index e2f3dd2e3..689ce3b95 100644 --- a/cargo/remote/BUILD.thiserror-1.0.22.bazel +++ b/cargo/remote/BUILD.thiserror-1.0.23.bazel @@ -40,7 +40,7 @@ rust_library( data = [], edition = "2018", proc_macro_deps = [ - "@raze__thiserror_impl__1_0_22//:thiserror_impl", + "@raze__thiserror_impl__1_0_23//:thiserror_impl", ], rustc_flags = [ "--cap-lints=allow", @@ -49,7 +49,7 @@ rust_library( "cargo-raze", "manual", ], - version = "1.0.22", + version = "1.0.23", # buildifier: leave-alone deps = [ ], diff --git a/cargo/remote/BUILD.thiserror-impl-1.0.22.bazel b/cargo/remote/BUILD.thiserror-impl-1.0.23.bazel similarity index 91% rename from cargo/remote/BUILD.thiserror-impl-1.0.22.bazel rename to cargo/remote/BUILD.thiserror-impl-1.0.23.bazel index f5ccf8239..a7fe4cd30 100644 --- a/cargo/remote/BUILD.thiserror-impl-1.0.22.bazel +++ b/cargo/remote/BUILD.thiserror-impl-1.0.23.bazel @@ -46,11 +46,11 @@ rust_library( "cargo-raze", "manual", ], - version = "1.0.22", + version = "1.0.23", # buildifier: leave-alone deps = [ "@raze__proc_macro2__1_0_24//:proc_macro2", - "@raze__quote__1_0_7//:quote", - "@raze__syn__1_0_54//:syn", + "@raze__quote__1_0_8//:quote", + "@raze__syn__1_0_56//:syn", ], ) diff --git a/cargo/remote/BUILD.tokio-0.2.24.bazel b/cargo/remote/BUILD.tokio-0.2.24.bazel index e2de160fe..7ccc39bf5 100644 --- a/cargo/remote/BUILD.tokio-0.2.24.bazel +++ b/cargo/remote/BUILD.tokio-0.2.24.bazel @@ -84,6 +84,7 @@ rust_library( # cfg(unix) ( "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", diff --git a/cargo/remote/BUILD.tokio-socks-0.3.0.bazel b/cargo/remote/BUILD.tokio-socks-0.3.0.bazel index 1a19112e1..17da2b07a 100644 --- a/cargo/remote/BUILD.tokio-socks-0.3.0.bazel +++ b/cargo/remote/BUILD.tokio-socks-0.3.0.bazel @@ -56,7 +56,7 @@ rust_library( "@raze__bytes__0_4_12//:bytes", "@raze__either__1_6_1//:either", "@raze__futures__0_3_8//:futures", - "@raze__thiserror__1_0_22//:thiserror", + "@raze__thiserror__1_0_23//:thiserror", "@raze__tokio__0_2_24//:tokio", ], ) diff --git a/cargo/remote/BUILD.tokio-tls-0.3.1.bazel b/cargo/remote/BUILD.tokio-tls-0.3.1.bazel index 34c448865..32f0df2bc 100644 --- a/cargo/remote/BUILD.tokio-tls-0.3.1.bazel +++ b/cargo/remote/BUILD.tokio-tls-0.3.1.bazel @@ -55,11 +55,12 @@ rust_library( version = "0.3.1", # buildifier: leave-alone deps = [ - "@raze__native_tls__0_2_6//:native_tls", + "@raze__native_tls__0_2_7//:native_tls", "@raze__tokio__0_2_24//:tokio", ] + selects.with_or({ # cfg(all(not(target_os = "macos"), not(windows), not(target_os = "ios"))) ( + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ ], diff --git a/cargo/remote/BUILD.toml-0.5.7.bazel b/cargo/remote/BUILD.toml-0.5.8.bazel similarity index 98% rename from cargo/remote/BUILD.toml-0.5.7.bazel rename to cargo/remote/BUILD.toml-0.5.8.bazel index bd08226aa..fd227be9b 100644 --- a/cargo/remote/BUILD.toml-0.5.7.bazel +++ b/cargo/remote/BUILD.toml-0.5.8.bazel @@ -53,7 +53,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.5.7", + version = "0.5.8", # buildifier: leave-alone deps = [ "@raze__serde__1_0_118//:serde", diff --git a/cargo/remote/BUILD.unic-langid-macros-impl-0.9.0.bazel b/cargo/remote/BUILD.unic-langid-macros-impl-0.9.0.bazel index 5c099766f..db33e331d 100644 --- a/cargo/remote/BUILD.unic-langid-macros-impl-0.9.0.bazel +++ b/cargo/remote/BUILD.unic-langid-macros-impl-0.9.0.bazel @@ -52,8 +52,8 @@ rust_library( version = "0.9.0", # buildifier: leave-alone deps = [ - "@raze__quote__1_0_7//:quote", - "@raze__syn__1_0_54//:syn", + "@raze__quote__1_0_8//:quote", + "@raze__syn__1_0_56//:syn", "@raze__unic_langid_impl__0_9_0//:unic_langid_impl", ], ) diff --git a/cargo/remote/BUILD.utime-0.3.1.bazel b/cargo/remote/BUILD.utime-0.3.1.bazel index 507d7fe63..d847a6ea6 100644 --- a/cargo/remote/BUILD.utime-0.3.1.bazel +++ b/cargo/remote/BUILD.utime-0.3.1.bazel @@ -55,6 +55,7 @@ rust_library( # cfg(unix) ( "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", + "@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", diff --git a/cargo/remote/BUILD.wasm-bindgen-0.2.69.bazel b/cargo/remote/BUILD.wasm-bindgen-0.2.69.bazel index 287aece2f..32a4a0575 100644 --- a/cargo/remote/BUILD.wasm-bindgen-0.2.69.bazel +++ b/cargo/remote/BUILD.wasm-bindgen-0.2.69.bazel @@ -95,7 +95,7 @@ rust_library( ":wasm_bindgen_build_script", "@raze__cfg_if__1_0_0//:cfg_if", "@raze__serde__1_0_118//:serde", - "@raze__serde_json__1_0_60//:serde_json", + "@raze__serde_json__1_0_61//:serde_json", ], ) diff --git a/cargo/remote/BUILD.wasm-bindgen-backend-0.2.69.bazel b/cargo/remote/BUILD.wasm-bindgen-backend-0.2.69.bazel index f03126fbc..fdb0a5215 100644 --- a/cargo/remote/BUILD.wasm-bindgen-backend-0.2.69.bazel +++ b/cargo/remote/BUILD.wasm-bindgen-backend-0.2.69.bazel @@ -54,8 +54,8 @@ rust_library( "@raze__lazy_static__1_4_0//:lazy_static", "@raze__log__0_4_11//:log", "@raze__proc_macro2__1_0_24//:proc_macro2", - "@raze__quote__1_0_7//:quote", - "@raze__syn__1_0_54//:syn", + "@raze__quote__1_0_8//:quote", + "@raze__syn__1_0_56//:syn", "@raze__wasm_bindgen_shared__0_2_69//:wasm_bindgen_shared", ], ) diff --git a/cargo/remote/BUILD.wasm-bindgen-macro-0.2.69.bazel b/cargo/remote/BUILD.wasm-bindgen-macro-0.2.69.bazel index eea980a0d..ecf60cef3 100644 --- a/cargo/remote/BUILD.wasm-bindgen-macro-0.2.69.bazel +++ b/cargo/remote/BUILD.wasm-bindgen-macro-0.2.69.bazel @@ -50,7 +50,7 @@ rust_library( version = "0.2.69", # buildifier: leave-alone deps = [ - "@raze__quote__1_0_7//:quote", + "@raze__quote__1_0_8//:quote", "@raze__wasm_bindgen_macro_support__0_2_69//:wasm_bindgen_macro_support", ], ) diff --git a/cargo/remote/BUILD.wasm-bindgen-macro-support-0.2.69.bazel b/cargo/remote/BUILD.wasm-bindgen-macro-support-0.2.69.bazel index d7e40c6d4..40291c0f4 100644 --- a/cargo/remote/BUILD.wasm-bindgen-macro-support-0.2.69.bazel +++ b/cargo/remote/BUILD.wasm-bindgen-macro-support-0.2.69.bazel @@ -51,8 +51,8 @@ rust_library( # buildifier: leave-alone deps = [ "@raze__proc_macro2__1_0_24//:proc_macro2", - "@raze__quote__1_0_7//:quote", - "@raze__syn__1_0_54//:syn", + "@raze__quote__1_0_8//:quote", + "@raze__syn__1_0_56//:syn", "@raze__wasm_bindgen_backend__0_2_69//:wasm_bindgen_backend", "@raze__wasm_bindgen_shared__0_2_69//:wasm_bindgen_shared", ], diff --git a/cargo/remote/BUILD.which-4.0.2.bazel b/cargo/remote/BUILD.which-4.0.2.bazel index 379db3d3b..7149ca557 100644 --- a/cargo/remote/BUILD.which-4.0.2.bazel +++ b/cargo/remote/BUILD.which-4.0.2.bazel @@ -50,7 +50,7 @@ rust_library( # buildifier: leave-alone deps = [ "@raze__libc__0_2_81//:libc", - "@raze__thiserror__1_0_22//:thiserror", + "@raze__thiserror__1_0_23//:thiserror", ], ) diff --git a/cargo/update.py b/cargo/update.py index 7ab683d67..d8e60ed18 100644 --- a/cargo/update.py +++ b/cargo/update.py @@ -17,10 +17,6 @@ COMMITS_SHALLOW_SINCE = { "f9ef687120d88744c1da50a222e19208b4553503": "1604362633 +1000", # tokio-io-timeout "96e1358555c49905de89170f2b1102a7d8b6c4c2": "1598411535 +1000", - # prost - "4ded4a98ef339da0b7babd4efee3fbe8adaf746b": "1598739849 -0700", - # pyo3 - "92b7a9736c9585883df5ec5bc01004caa7f65106": "1606725379 +0000", } import os @@ -114,8 +110,22 @@ def update_reqwest_deps(): file.write(data) +def stage_commit(): + subprocess.run( + [ + "git", + "add", + ".", + "../Cargo.lock", + "../rslib/cargo/BUILD.bazel", + "../pylib/rsbridge/BUILD.bazel", + ] + ) + + update_cargo_lock() run_cargo_raze() write_licenses() update_crates_bzl() update_reqwest_deps() +stage_commit() diff --git a/defs.bzl b/defs.bzl index ce6577804..eff3d9df2 100644 --- a/defs.bzl +++ b/defs.bzl @@ -3,14 +3,14 @@ load("@bazel_skylib//lib:versions.bzl", "versions") load("@io_bazel_rules_rust//rust:repositories.bzl", "rust_repositories") load("@net_ankiweb_anki//cargo:crates.bzl", "raze_fetch_remote_crates") load(":python.bzl", "setup_local_python") +load(":protobuf.bzl", "setup_protobuf_binary") load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install") load("@io_bazel_rules_sass//:defs.bzl", "sass_repositories") load("@build_bazel_rules_svelte//:defs.bzl", "rules_svelte_dependencies") -load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") load("@com_github_ali5h_rules_pip//:defs.bzl", "pip_import") load("//pip/pyqt5:defs.bzl", "install_pyqt5") -anki_version = "2.1.38" +anki_version = "2.1.39" def setup_deps(): bazel_skylib_workspace() @@ -26,6 +26,8 @@ def setup_deps(): setup_local_python(name = "python") + setup_protobuf_binary(name = "com_google_protobuf") + native.register_toolchains("@python//:python3_toolchain") pip_import( @@ -50,5 +52,3 @@ def setup_deps(): sass_repositories() rules_svelte_dependencies() - - protobuf_deps() diff --git a/docs/contributing.md b/docs/contributing.md index 41e0d9982..ecbe1a8aa 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -108,10 +108,6 @@ in one of those files will update the generated files. ## Translations -The translations into other languages will be fetched on the first build. -If you'd like to keep them up to date, you need to run 'make pull-i18n' -periodically. - For information on adding new translatable strings to Anki, please see https://translating.ankiweb.net/#/anki/developers @@ -121,8 +117,10 @@ Please make sure 'bazel test //...' completes successfully before submitting cod You can do this automatically by adding the following into .git/hooks/pre-commit or .git/hooks/pre-push and making it executable. +```sh #!/bin/bash bazel test //... +``` If your change is non-trivial and not covered by the existing unit tests, please consider adding a unit test at the same time. diff --git a/docs/development.md b/docs/development.md index 2319322f1..6d2e70078 100644 --- a/docs/development.md +++ b/docs/development.md @@ -54,6 +54,7 @@ Platform-specific instructions: - [Windows](./windows.md) - [Mac](./mac.md) - [Linux](./linux.md) +- [Other Platforms](./new-platform.md) Don't name the Git checkout ~/Anki or ~/Documents/Anki, as those folders were used on old Anki versions and will be automatically moved. @@ -188,6 +189,17 @@ Audio playing requires `mpv` or `mplayer` to be in your system path. Recording also requires `lame` to be in your system path. +## Build errors and cleaning + +If you get errors with @npm and node_modules in the message, try deleting the +ts/node_modules folder. + +Unlike the old Make system, a "clean build" should almost never be required +unless you are debugging issues with the build system. But if you need to get +things to a fresh state, you can run `bazel clean --expunge`. Afte doing so, +make sure you remove the ts/node_modules folder, or subsequent build commands +will fail with a "no such file or directory node_modules/anki" message. + ## Tracing build problems You can run bazel with '-s' to print the commands that are being executed. @@ -212,14 +224,6 @@ in the collection2.log file will also be printed on stdout. If ANKI_PROFILE_CODE is set, Python profiling data will be written on exit. -## Cleaning - -Unlike the old Make system, a "clean build" should almost never be required -unless you are debugging issues with the build system. But if you need to get -things to a fresh state, you can run `bazel clean --expunge`. Afte doing so, -make sure you remove the ts/node_modules folder, or subsequent build commands -will fail with a "no such file or directory node_modules/anki" message. - ## Mixing development and study You may wish to create a separate profile with File>Switch Profile for use diff --git a/docs/linux.md b/docs/linux.md index d5bfc0178..275991dd0 100644 --- a/docs/linux.md +++ b/docs/linux.md @@ -4,6 +4,10 @@ These instructions are written for Debian/Ubuntu; adjust for your distribution. +Glibc is required - if you are on a distro like Alpine that uses musl, you'll need +to contribute fixes to the upstream [Rust rules](https://github.com/bazelbuild/rules_rust/issues/390), +then follow the steps in [Other Platforms](./new-platform.md). + **Ensure some basic tools are installed**: ``` @@ -24,14 +28,19 @@ If you are using a packaged Python version that is installed in /usr/bin, you ca immediately to the next section. If Python 3.8 is not available in your distro, you can download it from python.org, -compile it, and install in in /usr/local. +compile it, and install it in /usr/local. + +If you're on a basic Debian install, make sure you have the following installed +before building Python: + +gcc g++ make libsqlite3-dev libreadline-dev libssl-dev zlib1g-dev libffi-dev Bazel does not look in /usr/local by default. If you've installed Python somewhere other than /usr/bin, you'll need to put the following into a file called user.bazelrc at the top of this repo before proceeding: ``` -build --action_env=PYTHON_SYS_EXECUTABLE=/usr/local/bin/python +build --action_env=PYTHON_SYS_EXECUTABLE=/usr/local/bin/python3.8 ``` If you're building Anki from a docker container or distro that has no `python` command in diff --git a/docs/new-platform.md b/docs/new-platform.md new file mode 100644 index 000000000..777842287 --- /dev/null +++ b/docs/new-platform.md @@ -0,0 +1,114 @@ +# Building on a new platform + +## Upstream prerequisites + +- A recent Qt, PyQt5 and PyQtWebEngine must work on your platform. Chances are wheels + for your platform are not available on PyPI, so you will need to have a working + version installed already, either from your Linux distro's archives, or by building + from source. +- Rust and Node must support your platform. +- If the Bazel Rust and Node rules do not support your platform, extra work may be required. + +## 32 bit builds + +Bazel does not support running on a 32-bit host. It may be theoretically +possible to cross-compile from a 64-bit host, but this is not something we've +tried, and it will likely not work out of the box. + +## Protobuf & Python + +- Edit /platforms/BUILD.bzl and add the new platform. Available platforms + and CPUs can be found here: https://github.com/bazelbuild/platforms +- Edit /protobuf.bzl and add the new platform and a link to a protoc binary. +- Edit /pylib/anki/BUILD.bazel and add the new platform and the relevant + Python wheel name for your platform. + +Example of the above changes: +https://github.com/ankitects/anki/commit/db3308e788f20b188e84add40d6a1dce5bf726a0 + +- We need to tell the build process to use your local PyQt5 install, instead of + fetching it from PyPI. Locate your Python site-packages folder where the PyQt5 + folder is, and add the following to user.bazelrc in the project folder root: + +``` +build --action_env=PYTHON_SITE_PACKAGES=/path/to/site-packages +``` + +- Anki uses the Python 'orjson' module. If it's not available on your system, + you will need to [patch it out](https://github.com/ankitects/anki/pull/752#issuecomment-748861582), and remove references to it in the build scripts. + +## Rust + +- Ensure you have Rust installed (eg via rustup) +- Edit /Cargo.toml in this project, and add your platform + to the targets. Check that the platform [is supported](https://github.com/bazelbuild/rules_rust/blob/master/rust/platform/platform.bzl) by rules_rust; if it is not, you'll + need to send a PR to them adding it. You can test your change locally by modifying + /repos.bzl in this project to point to a local rules_rust checkout. +- Edit /cargo/BUILD.request.bazel and add the new platform. +- Run update.py in the /cargo folder. + +Examples of the required changes: + +- https://github.com/ankitects/anki/commit/eca27b371000e77b68cb4c790b44848507ca3883 +- https://github.com/ankitects/anki/commit/3f3f4b5c3640a7d1f4eec02f326fda93214ec34b + +## NodeJS + +If node doesn't provide a binary for your platform and you have a local copy +installed, you can create a local_node folder in the project root, symlink in +your local installation, and modify defs.bzl. + +```patch +diff --git a/defs.bzl b/defs.bzl +index eff3d9df2..fb2e9f7fe 100644 +--- a/defs.bzl ++++ b/defs.bzl +@@ -41,7 +41,15 @@ def setup_deps(): + python_runtime = "@python//:python", + ) + +- node_repositories(package_json = ["@net_ankiweb_anki//ts:package.json"]) ++ native.local_repository( ++ name = "local_node", ++ path = "local_node", ++ ) ++ ++ node_repositories( ++ package_json = ["@net_ankiweb_anki//ts:package.json"], ++ vendored_node = "@local_node//:node", ++ ) + + yarn_install( + name = "npm", +diff --git a/local_node/BUILD.bazel b/local_node/BUILD.bazel +new file mode 100644 +index 000000000..aa0c473ae +--- /dev/null ++++ b/local_node/BUILD.bazel +@@ -0,0 +1 @@ ++exports_files(["node/bin/node"] + glob(["node/lib/node_modules/**"])) +diff --git a/local_node/WORKSPACE b/local_node/WORKSPACE +new file mode 100644 +index 000000000..e69de29bb +diff --git a/local_node/node/bin/node b/local_node/node/bin/node +new file mode 120000 +index 000000000..d7b371472 +--- /dev/null ++++ b/local_node/node/bin/node +@@ -0,0 +1 @@ ++/usr/local/bin/node +\ No newline at end of file +diff --git a/local_node/node/lib/node_modules b/local_node/node/lib/node_modules +new file mode 120000 +index 000000000..23dd0736e +--- /dev/null ++++ b/local_node/node/lib/node_modules +@@ -0,0 +1 @@ ++/usr/local/lib/node_modules +\ No newline at end of file +``` + +## Submitting changes + +If the changes to support your platform do not require platform-specific hacks, +a PR that adds them is welcome - please see [Contributing](./contributing.md) for more. diff --git a/ftl/BUILD.bazel b/ftl/BUILD.bazel index 9b9c13fac..a78badad2 100644 --- a/ftl/BUILD.bazel +++ b/ftl/BUILD.bazel @@ -1,7 +1,8 @@ load("@py_deps//:requirements.bzl", "requirement") fluent_syntax = [ - requirement("fluent-syntax"), + requirement("fluent.syntax"), + requirement("compare-locales"), # undeclared runtime dependency requirement("six"), ] diff --git a/ftl/core/actions.ftl b/ftl/core/actions.ftl index 5822bb7ab..11be42642 100644 --- a/ftl/core/actions.ftl +++ b/ftl/core/actions.ftl @@ -24,6 +24,7 @@ actions-rebuild = Rebuild actions-red-flag = Red Flag actions-rename = Rename actions-rename-deck = Rename Deck +actions-rename-tag = Rename Tag actions-replay-audio = Replay Audio actions-reposition = Reposition actions-save = Save diff --git a/ftl/core/browsing.ftl b/ftl/core/browsing.ftl index b359e2012..eea2c7fb5 100644 --- a/ftl/core/browsing.ftl +++ b/ftl/core/browsing.ftl @@ -94,6 +94,7 @@ browsing-step = Step: browsing-studied-today = Studied Today browsing-suspended = Suspended browsing-tag-duplicates = Tag Duplicates +browsing-tag-rename-warning-empty = You can't rename a tag that has no notes. browsing-target-field = Target field: browsing-today = Today browsing-toggle-mark = Toggle Mark diff --git a/ftl/core/fields.ftl b/ftl/core/fields.ftl index ddeb41e33..e986a358e 100644 --- a/ftl/core/fields.ftl +++ b/ftl/core/fields.ftl @@ -12,3 +12,5 @@ fields-reverse-text-direction-rtl = Reverse text direction (RTL) fields-size = Size: fields-sort-by-this-field-in-the = Sort by this field in the browser fields-that-field-name-is-already-used = That field name is already used. +fields-name-first-letter-not-valid = The field name should not start with #, ^ or /. +fields-name-invalid-letter = The field name should not contain :, ", { "{" } or { "}" }. diff --git a/ftl/core/preferences.ftl b/ftl/core/preferences.ftl index 10ee2b028..3266d489b 100644 --- a/ftl/core/preferences.ftl +++ b/ftl/core/preferences.ftl @@ -6,7 +6,6 @@ preferences-backupsanki-will-create-a-backup-of =

bool: + "True if file is ok." + file = File(path, os.path.basename(path)) + content = open(path, "rb").read() + p = parser.getParser(file.file) + p.readContents(content) + refList = p.parse() + + p.readContents(content) + for e in p.parse(): + ref_data = ReferenceMessageVisitor() + ref_data.visit(e.entry) + + for attr_or_val, refs in ref_data.entry_refs.items(): + for ref, ref_type in refs.items(): + if ref not in refList: + print(f"In {path}:{e}, missing '{ref}'") + return False + + return True def check_file(path: str, fix: bool) -> bool: @@ -31,7 +57,7 @@ def check_file(path: str, fix: bool) -> bool: raise Exception(f"file introduced junk! {path} {ent}") if new_text == orig_text: - return True + return check_missing_terms(path) if fix: print(f"Fixing {path}") @@ -39,6 +65,17 @@ def check_file(path: str, fix: bool) -> bool: return True else: print(f"Bad formatting in {path}") + print( + "\n".join( + difflib.unified_diff( + orig_text.splitlines(), + new_text.splitlines(), + fromfile="bad", + tofile="good", + lineterm="", + ) + ) + ) return False @@ -50,7 +87,7 @@ def check_files(files: List[str], fix: bool) -> bool: ok = check_file(path, fix) if not ok: found_bad = True - return True + return not found_bad if __name__ == "__main__": diff --git a/ftl/qt/preferences.ftl b/ftl/qt/preferences.ftl index 7d64939a0..e5765edfe 100644 --- a/ftl/qt/preferences.ftl +++ b/ftl/qt/preferences.ftl @@ -4,3 +4,12 @@ preferences-dark-mode-active = macOS is in dark mode preferences-dark-mode-disable = To show Anki in light mode while macOS is in dark mode, please see the Night Mode section of the manual. + +## Video drivers/hardware acceleration. Please avoid translating 'OpenGL' and 'ANGLE'. + +preferences-video-driver = Video driver: { $driver } +preferences-video-driver-opengl-mac = OpenGL (recommended on Macs) +preferences-video-driver-software-mac = Software (not recommended) +preferences-video-driver-opengl-other = OpenGL (faster, may cause issues) +preferences-video-driver-software-other = Software (slower) +preferences-video-driver-angle = ANGLE (may work better than OpenGL) diff --git a/ftl/sync.py b/ftl/sync.py index f929ce935..0696d99f6 100644 --- a/ftl/sync.py +++ b/ftl/sync.py @@ -9,6 +9,8 @@ import re import os import sys from typing import Optional, Tuple +import requests +from hashlib import sha256 root = os.environ["BUILD_WORKSPACE_DIRECTORY"] repos_bzl = os.path.join(root, "repos.bzl") @@ -64,18 +66,32 @@ def update_git_repos(): @dataclass class GitInfo: sha1: str - shallow_since: str + zip_sha256: str + + +def git_url_to_zip_url(repo: str, commit: str) -> str: + repo = repo.replace("git@github.com:", "https://github.com/") + return f"{repo}/archive/{commit}.zip" + + +def get_zip_sha(zip_url: str) -> str: + resp = requests.get(zip_url) + resp.raise_for_status() + return sha256(resp.content).hexdigest() def module_git_info(module: Module) -> GitInfo: folder = module.folder() - sha = subprocess.check_output( + sha1 = subprocess.check_output( ["git", "log", "-n", "1", "--pretty=format:%H"], cwd=folder + ).decode("utf8") + zip_url = git_url_to_zip_url(module.repo, sha1) + zip_sha = get_zip_sha(zip_url) + + return GitInfo( + sha1=sha1, + zip_sha256=zip_sha, ) - shallow = subprocess.check_output( - ["git", "log", "-n", "1", "--pretty=format:%cd", "--date=raw"], cwd=folder - ) - return GitInfo(sha1=sha.decode("utf8"), shallow_since=shallow.decode("utf8")) def update_repos_bzl(): @@ -85,12 +101,12 @@ def update_repos_bzl(): git = module_git_info(module) prefix = f"{module.name}_i18n_" entries[prefix + "commit"] = git.sha1 - entries[prefix + "shallow_since"] = git.shallow_since + entries[prefix + "zip_csum"] = git.zip_sha256 # apply out = [] path = repos_bzl - reg = re.compile(r'(\s+)(\S+_(?:commit|shallow_since)) = "(.*)"') + reg = re.compile(r'(\s+)(\S+_(?:commit|zip_csum)) = "(.*)"') for line in open(path).readlines(): if m := reg.match(line): (indent, key, _oldvalue) = m.groups() diff --git a/pip/pyqt5/install_pyqt5.py b/pip/pyqt5/install_pyqt5.py index 89b842fcf..13f3234af 100644 --- a/pip/pyqt5/install_pyqt5.py +++ b/pip/pyqt5/install_pyqt5.py @@ -9,6 +9,7 @@ import os import shutil import sys import re +import subprocess from pip._internal.commands import create_command from pip._vendor import pkg_resources @@ -76,12 +77,15 @@ def install_package(pkg, directory, pip_args): return pkginfo.Wheel(dist_info) + def _cleanup(directory, pattern): for p in glob.glob(os.path.join(directory, pattern)): shutil.rmtree(p) + fix_none = re.compile(r"(\s*None) =") + def copy_and_fix_pyi(source, dest): "Fix broken PyQt types." with open(source) as input_file: @@ -90,6 +94,7 @@ def copy_and_fix_pyi(source, dest): line = fix_none.sub(r"\1_ =", line) output_file.write(line) + def merge_files(root, source): for dirpath, _dirnames, filenames in os.walk(source): target_dir = os.path.join(root, os.path.relpath(dirpath, source)) @@ -104,22 +109,40 @@ def merge_files(root, source): else: shutil.copy2(source_path, target_path) + def main(): base = sys.argv[1] - packages = [ - ("pyqt5", "pyqt5==5.15.2"), - ("pyqtwebengine", "pyqtwebengine==5.15.2"), - ("pyqt5-sip", "pyqt5_sip==12.8.1"), - ] + local_site_packages = os.environ.get("PYTHON_SITE_PACKAGES") + if local_site_packages: + subprocess.run( + [ + "rsync", + "-ai", + "--include=PyQt**", + "--exclude=*", + local_site_packages, + base + "/", + ], + check=True, + ) + with open(os.path.join(base, "__init__.py"), "w") as file: + pass - for (name, with_version) in packages: - # install package in subfolder - folder = os.path.join(base, "temp") - _pkg = install_package(with_version, folder, []) - # merge into parent - merge_files(base, folder) - shutil.rmtree(folder) + else: + packages = [ + ("pyqt5", "pyqt5==5.15.2"), + ("pyqtwebengine", "pyqtwebengine==5.15.2"), + ("pyqt5-sip", "pyqt5_sip==12.8.1"), + ] + + for (name, with_version) in packages: + # install package in subfolder + folder = os.path.join(base, "temp") + _pkg = install_package(with_version, folder, []) + # merge into parent + merge_files(base, folder) + shutil.rmtree(folder) # add missing py.typed file with open(os.path.join(base, "py.typed"), "w") as file: diff --git a/pip/requirements.in b/pip/requirements.in index aeb852182..018127927 100644 --- a/pip/requirements.in +++ b/pip/requirements.in @@ -1,5 +1,6 @@ beautifulsoup4 black +compare-locales decorator distro flask @@ -19,12 +20,15 @@ requests[socks] send2trash snakeviz stringcase -waitress -fluent-syntax +waitress>=2.0.0b1 +fluent.syntax # windows only psutil; sys.platform == "win32" pywin32; sys.platform == "win32" +# pinned due to https://github.com/microsoft/xlang/issues/717 +winrt==1.0.20239.1; sys.platform == "win32" and platform_release == "10" and python_version == "3.8" +winrt; sys.platform == "win32" and platform_release == "10" and python_version >= "3.9" # transitive windows dependencies atomicwrites; sys.platform == "win32" # via pytest diff --git a/pip/requirements.txt b/pip/requirements.txt index bff2336d8..bcfb89a51 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -1,64 +1,163 @@ -# See README.md - -appdirs==1.4.4 # via black -astroid==2.4.2 # via pylint -atomicwrites==1.4.0 ; sys_platform == "win32" # via -r requirements.in, pytest -attrs==20.3.0 # via jsonschema, pytest -beautifulsoup4==4.9.3 # via -r requirements.in -black==20.8b1 # via -r requirements.in -certifi==2020.12.5 # via requests -chardet==4.0.0 # via requests -click==7.1.2 # via black, flask, pip-tools -colorama==0.4.4 ; sys_platform == "win32" # via -r requirements.in, pylint, pytest -decorator==4.4.2 # via -r requirements.in -distro==1.5.0 # via -r requirements.in -flask-cors==3.0.9 # via -r requirements.in -flask==1.1.2 # via -r requirements.in, flask-cors -fluent-syntax==0.18.1 # via -r requirements.in -idna==2.10 # via requests -iniconfig==1.1.1 # via pytest -isort==5.6.4 # via -r requirements.in, pylint -itsdangerous==1.1.0 # via flask -jinja2==2.11.2 # via flask -jsonschema==3.2.0 # via -r requirements.in -lazy-object-proxy==1.4.3 # via astroid -markdown==3.3.3 # via -r requirements.in -markupsafe==1.1.1 # via jinja2 -mccabe==0.6.1 # via pylint -mock==4.0.3 # via -r requirements.in -mypy-extensions==0.4.3 # via black, mypy -mypy-protobuf==1.23 # via -r requirements.in -mypy==0.790 # via -r requirements.in -orjson==3.4.6 # via -r requirements.in -packaging==20.8 # via pytest -pathspec==0.8.1 # via black -pip-tools==5.4.0 # via -r requirements.in -pluggy==0.13.1 # via pytest -protobuf==3.14.0 # via -r requirements.in, mypy-protobuf -psutil==5.7.3 ; sys_platform == "win32" # via -r requirements.in -py==1.10.0 # via pytest -pylint==2.6.0 # via -r requirements.in -pyparsing==2.4.7 # via packaging -pyrsistent==0.17.3 # via jsonschema -pysocks==1.7.1 # via requests -pytest==6.2.1 # via -r requirements.in -pywin32==300 ; sys_platform == "win32" # via -r requirements.in -regex==2020.11.13 # via black -requests[socks]==2.25.1 # via -r requirements.in -send2trash==1.5.0 # via -r requirements.in -six==1.15.0 # via astroid, flask-cors, jsonschema, pip-tools, protobuf -snakeviz==2.1.0 # via -r requirements.in -soupsieve==2.1 # via beautifulsoup4 -stringcase==1.2.0 # via -r requirements.in -toml==0.10.2 # via black, pylint, pytest -tornado==6.1 # via snakeviz -typed-ast==1.4.1 # via black, mypy -typing-extensions==3.7.4.3 # via black, mypy -urllib3==1.26.2 # via requests -waitress==1.4.4 # via -r requirements.in -werkzeug==1.0.1 # via flask -wrapt==1.12.1 # via astroid +appdirs==1.4.4 + # via black +astroid==2.4.2 + # via pylint +atomicwrites==1.4.0 ; sys_platform == "win32" + # via + # -r requirements.in + # pytest +attrs==20.3.0 + # via + # jsonschema + # pytest +beautifulsoup4==4.9.3 + # via -r requirements.in +black==20.8b1 + # via -r requirements.in +certifi==2020.12.5 + # via requests +chardet==4.0.0 + # via requests +click==7.1.2 + # via + # black + # flask + # pip-tools +colorama==0.4.4 ; sys_platform == "win32" + # via + # -r requirements.in + # pylint + # pytest +compare-locales==8.1.0 + # via -r requirements.in +decorator==4.4.2 + # via -r requirements.in +distro==1.5.0 + # via -r requirements.in +flask-cors==3.0.9 + # via -r requirements.in +flask==1.1.2 + # via + # -r requirements.in + # flask-cors +fluent.syntax==0.18.1 + # via + # -r requirements.in + # compare-locales +idna==2.10 + # via requests +iniconfig==1.1.1 + # via pytest +isort==5.7.0 + # via + # -r requirements.in + # pylint +itsdangerous==1.1.0 + # via flask +jinja2==2.11.2 + # via flask +jsonschema==3.2.0 + # via -r requirements.in +lazy-object-proxy==1.4.3 + # via astroid +markdown==3.3.3 + # via -r requirements.in +markupsafe==1.1.1 + # via jinja2 +mccabe==0.6.1 + # via pylint +mock==4.0.3 + # via -r requirements.in +mypy-extensions==0.4.3 + # via + # black + # mypy +mypy-protobuf==1.23 + # via -r requirements.in +mypy==0.790 + # via -r requirements.in +orjson==3.4.6 + # via -r requirements.in +packaging==20.8 + # via pytest +pathspec==0.8.1 + # via black +pip-tools==5.5.0 + # via -r requirements.in +pluggy==0.13.1 + # via pytest +protobuf==3.14.0 + # via + # -r requirements.in + # mypy-protobuf +psutil==5.8.0 ; sys_platform == "win32" + # via -r requirements.in +py==1.10.0 + # via pytest +pylint==2.6.0 + # via -r requirements.in +pyparsing==2.4.7 + # via packaging +pyrsistent==0.17.3 + # via jsonschema +pysocks==1.7.1 + # via requests +pytest==6.2.1 + # via -r requirements.in +pytoml==0.1.21 + # via compare-locales +pywin32==300 ; sys_platform == "win32" + # via -r requirements.in +regex==2020.11.13 + # via black +requests[socks]==2.25.1 + # via -r requirements.in +send2trash==1.5.0 + # via -r requirements.in +six==1.15.0 + # via + # astroid + # compare-locales + # flask-cors + # jsonschema + # protobuf +snakeviz==2.1.0 + # via -r requirements.in +soupsieve==2.1 + # via beautifulsoup4 +stringcase==1.2.0 + # via -r requirements.in +toml==0.10.2 + # via + # black + # pylint + # pytest +tornado==6.1 + # via snakeviz +typed-ast==1.4.2 + # via + # black + # mypy +typing-extensions==3.7.4.3 + # via + # black + # mypy +urllib3==1.26.2 + # via requests +waitress==2.0.0b1 + # via -r requirements.in +werkzeug==1.0.1 + # via flask +winrt==1.0.20239.1 ; sys_platform == "win32" and platform_release == "10" and python_version == "3.8" + # via -r requirements.in +wrapt==1.12.1 + # via astroid # The following packages are considered to be unsafe in a requirements file: -pip==20.3.3 # via pip-tools -setuptools==51.0.0 # via jsonschema +pip==20.3.3 + # via pip-tools +setuptools==51.1.1 + # via jsonschema + +# manually added for now; ensure it and the earlier winrt are not removed on update +winrt==1.0.20330.1; sys.platform == "win32" and platform_release == "10" and python_version >= "3.9" diff --git a/pip/update.py b/pip/update.py index 1ff1adfd4..cffc5128a 100644 --- a/pip/update.py +++ b/pip/update.py @@ -3,15 +3,31 @@ import os import click from piptools.scripts import compile + @click.group() def cli(): pass + cli.add_command(compile.cli, "compile") print("Updating deps...") os.chdir("pip") -sys.argv[1:] = ["compile", "--allow-unsafe", "--upgrade"] +sys.argv[1:] = ["compile", "--allow-unsafe", "--upgrade", "--no-header"] + + +def after_run(): + with open("requirements.txt", "a+") as file: + file.write( + """ +# manually added for now; ensure it and the earlier winrt are not removed on update +winrt==1.0.20330.1; sys.platform == "win32" and platform_release == "10" and python_version >= "3.9" +""" + ) + + +import atexit + +atexit.register(after_run) cli() - diff --git a/platforms/BUILD.bazel b/platforms/BUILD.bazel index fc44cb912..57e1d7557 100644 --- a/platforms/BUILD.bazel +++ b/platforms/BUILD.bazel @@ -23,3 +23,11 @@ config_setting( "@platforms//cpu:x86_64", ], ) + +config_setting( + name = "linux_arm64", + constraint_values = [ + "@platforms//os:linux", + "@platforms//cpu:aarch64", + ], +) diff --git a/platforms/README.md b/platforms/README.md index 651ff8de4..c55b72f75 100644 --- a/platforms/README.md +++ b/platforms/README.md @@ -1,2 +1,2 @@ -Platform constraints. Currently only used to control wheel filenames -on a per-platform basis. +Platform constraints, used for things like controlling wheel filenames +on a per-platform basis, and selecting the correct protobuf binary. diff --git a/protobuf.bzl b/protobuf.bzl new file mode 100644 index 000000000..b46af971b --- /dev/null +++ b/protobuf.bzl @@ -0,0 +1,74 @@ +""" +Replace @com_google_protobuf with a platform binary. + +Avoids the long initial compile, but will fail if anything depends on the protobuf library. +""" + +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") +load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe") + +def _impl(rctx): + rctx.file("BUILD.bazel", """ +alias( + name = "protoc", + actual = select({ + "@net_ankiweb_anki//platforms:windows_x86_64": "@protoc_bin_windows//:bin/protoc.exe", + "@net_ankiweb_anki//platforms:macos_x86_64": "@protoc_bin_macos//:bin/protoc", + "@net_ankiweb_anki//platforms:linux_x86_64": "@protoc_bin_linux_x86_64//:bin/protoc", + "@net_ankiweb_anki//platforms:linux_arm64": "@protoc_bin_linux_arm64//:bin/protoc" + }), + visibility = ["//visibility:public"] +) +""") + +_setup_protoc = repository_rule( + implementation = _impl, + local = True, + attrs = {}, +) + +def setup_protobuf_binary(name): + maybe( + http_archive, + name = "protoc_bin_macos", + urls = [ + "https://github.com/protocolbuffers/protobuf/releases/download/v3.14.0/protoc-3.14.0-osx-x86_64.zip", + ], + sha256 = "699ceee7ef0988ecf72bf1c146dee5d9d89351a19d4093d30ebea3c04008bb8c", + build_file_content = """exports_files(["bin/protoc"])""", + ) + + maybe( + http_archive, + name = "protoc_bin_linux_x86_64", + urls = [ + "https://github.com/protocolbuffers/protobuf/releases/download/v3.14.0/protoc-3.14.0-linux-x86_64.zip", + ], + sha256 = "a2900100ef9cda17d9c0bbf6a3c3592e809f9842f2d9f0d50e3fba7f3fc864f0", + build_file_content = """exports_files(["bin/protoc"])""", + ) + + maybe( + http_archive, + name = "protoc_bin_linux_arm64", + urls = [ + "https://github.com/protocolbuffers/protobuf/releases/download/v3.14.0/protoc-3.14.0-linux-aarch_64.zip", + ], + sha256 = "67db019c10ad0a151373278383e4e9b756dc90c3cea6c1244d5d5bd230af7c1a", + build_file_content = """exports_files(["bin/protoc"])""", + ) + + maybe( + http_archive, + name = "protoc_bin_windows", + urls = [ + "https://github.com/protocolbuffers/protobuf/releases/download/v3.14.0/protoc-3.14.0-win64.zip", + ], + sha256 = "642554ed4dd2dba94e1afddcccdd7d832999cea309299cc5952f13db389894f8", + build_file_content = """exports_files(["bin/protoc.exe"])""", + ) + + if not native.existing_rule(name): + _setup_protoc( + name = name, + ) diff --git a/pylib/anki/BUILD.bazel b/pylib/anki/BUILD.bazel index 525ec667c..4dc4f721b 100644 --- a/pylib/anki/BUILD.bazel +++ b/pylib/anki/BUILD.bazel @@ -114,6 +114,7 @@ py_wheel( "//platforms:windows_x86_64": "win_amd64", "//platforms:macos_x86_64": "macosx_10_7_x86_64", "//platforms:linux_x86_64": "manylinux2014_x86_64", + "//platforms:linux_arm64": "manylinux2014_aarch64", }), python_tag = "cp38", python_version = ">=3.8", @@ -129,6 +130,7 @@ py_wheel( strip_path_prefixes = [ "pylib/", ], + tags = ["manual"], version = anki_version, visibility = ["//visibility:public"], deps = [":anki_pkg"], diff --git a/pylib/anki/collection.py b/pylib/anki/collection.py index 77eab8716..6ac769814 100644 --- a/pylib/anki/collection.py +++ b/pylib/anki/collection.py @@ -196,7 +196,7 @@ class Collection: # Until we can move away from long-running transactions, the Python # code needs to know if transaction should be committed, so we need # to check if the backend updated the modification time. - return self.db.last_begin_at <= self.mod + return self.db.last_begin_at != self.mod def save( self, name: Optional[str] = None, mod: Optional[int] = None, trx: bool = True diff --git a/pylib/anki/consts.py b/pylib/anki/consts.py index aaab49073..6ff036b1e 100644 --- a/pylib/anki/consts.py +++ b/pylib/anki/consts.py @@ -86,6 +86,7 @@ REVLOG_LRN = 0 REVLOG_REV = 1 REVLOG_RELRN = 2 REVLOG_CRAM = 3 +REVLOG_RESCHED = 4 # Labels ########################################################################## diff --git a/pylib/anki/dbproxy.py b/pylib/anki/dbproxy.py index e555c74b3..1a9c024ff 100644 --- a/pylib/anki/dbproxy.py +++ b/pylib/anki/dbproxy.py @@ -30,7 +30,7 @@ class DBProxy: ############### def begin(self) -> None: - self.last_begin_at = anki.utils.intTime(1000) + self.last_begin_at = self.scalar("select mod from col") self._backend.db_begin() def commit(self) -> None: diff --git a/pylib/anki/decks.py b/pylib/anki/decks.py index 675da7c21..0c71ceeac 100644 --- a/pylib/anki/decks.py +++ b/pylib/anki/decks.py @@ -210,6 +210,16 @@ class DeckManager: def count(self) -> int: return len(self.all_names_and_ids()) + def card_count(self, did: int, include_subdecks: bool) -> Any: + dids: List[int] = [did] + if include_subdecks: + dids += [r[1] for r in self.children(did)] + count = self.col.db.scalar( + "select count() from cards where did in {0} or " + "odid in {0}".format(ids2str(dids)) + ) + return count + def get(self, did: Union[int, str], default: bool = True) -> Optional[Deck]: if not did: if default: @@ -420,7 +430,7 @@ class DeckManager: def selected(self) -> int: "The currently selected did." - return self.col.conf["curDeck"] + return int(self.col.conf["curDeck"]) def current(self) -> Deck: return self.get(self.selected()) diff --git a/pylib/anki/schedv2.py b/pylib/anki/schedv2.py index 91491ca4d..a34033088 100644 --- a/pylib/anki/schedv2.py +++ b/pylib/anki/schedv2.py @@ -1408,7 +1408,7 @@ and (queue={QUEUE_TYPE_NEW} or (queue={QUEUE_TYPE_REV} and due<=?))""", def schedule_cards_as_new(self, card_ids: List[int]) -> None: "Put cards at the end of the new queue." - self.col.backend.schedule_cards_as_new(card_ids) + self.col.backend.schedule_cards_as_new(card_ids=card_ids, log=True) def schedule_cards_as_reviews( self, card_ids: List[int], min_interval: int, max_interval: int @@ -1432,8 +1432,7 @@ and (queue={QUEUE_TYPE_NEW} or (queue={QUEUE_TYPE_REV} and due<=?))""", " where id in %s" % sids ) # and forget any non-new cards, changing their due numbers - self.forgetCards(nonNew) - self.col.log(ids) + self.col.backend.schedule_cards_as_new(card_ids=nonNew, log=False) # legacy diff --git a/pylib/anki/tags.py b/pylib/anki/tags.py index 3eba489a7..f4f8008e3 100644 --- a/pylib/anki/tags.py +++ b/pylib/anki/tags.py @@ -13,7 +13,7 @@ from __future__ import annotations import pprint import re -from typing import Collection, List, Optional, Tuple +from typing import Collection, List, Optional, Sequence, Tuple import anki # pylint: disable=unused-import from anki.utils import ids2str @@ -92,7 +92,7 @@ class TagManager: return self.col.backend.add_note_tags(nids=nids, tags=tags) def bulk_update( - self, nids: List[int], tags: str, replacement: str, regex: bool + self, nids: Sequence[int], tags: str, replacement: str, regex: bool ) -> int: """Replace space-separated tags, returning changed count. Tags replaced with an empty string will be removed.""" @@ -100,6 +100,15 @@ class TagManager: nids=nids, tags=tags, replacement=replacement, regex=regex ) + def rename_tag(self, old: str, new: str) -> int: + "Rename provided tag, returning number of changed notes." + escaped_name = re.sub(r"[*_\\]", r"\\\g<0>", old) + escaped_name = '"{}"'.format(escaped_name.replace('"', '\\"')) + nids = self.col.find_notes("tag:" + escaped_name) + if not nids: + return 0 + return self.col.tags.bulk_update(nids, old, new, False) + # legacy routines def bulkAdd(self, ids: List[int], tags: str, add: bool = True) -> None: diff --git a/pylib/rsbridge/Cargo.toml b/pylib/rsbridge/Cargo.toml index 0bccffb81..bc76b4cd3 100644 --- a/pylib/rsbridge/Cargo.toml +++ b/pylib/rsbridge/Cargo.toml @@ -11,8 +11,7 @@ anki = { path = "../../rslib" } # /cargo/update.py needs to be run if updating the version below [dependencies.pyo3] -git = "https://github.com/PyO3/pyo3.git" -rev = "92b7a9736c9585883df5ec5bc01004caa7f65106" +version = "0.13" features = ["extension-module", "abi3"] [lib] diff --git a/pylib/rsbridge/cargo/BUILD.bazel b/pylib/rsbridge/cargo/BUILD.bazel index 61ed03e85..f4c169ae5 100644 --- a/pylib/rsbridge/cargo/BUILD.bazel +++ b/pylib/rsbridge/cargo/BUILD.bazel @@ -14,7 +14,7 @@ licenses([ # Aliased targets alias( name = "pyo3", - actual = "@raze__pyo3__0_12_4//:pyo3", + actual = "@raze__pyo3__0_13_0//:pyo3", tags = [ "cargo-raze", "manual", diff --git a/python.bzl b/python.bzl index 67b7d72c1..8926cb672 100644 --- a/python.bzl +++ b/python.bzl @@ -8,13 +8,16 @@ def _impl(rctx): "python.exe", ] path = None - for name in names: - path = rctx.which(name) - if path: - break + if rctx.os.environ.get("PYTHON_SYS_EXECUTABLE"): + path = rctx.os.environ.get("PYTHON_SYS_EXECUTABLE") + else: + for name in names: + path = rctx.which(name) + if path: + break if not path: - fail("python3 or python.exe not found on path") + fail("python3 or python.exe not found on path, and PYTHON_SYS_EXECUTABLE not set") rctx.symlink(path, "python") rctx.file("BUILD.bazel", """ diff --git a/qt/aqt/BUILD.bazel b/qt/aqt/BUILD.bazel index 42836be2e..7bfa5f261 100644 --- a/qt/aqt/BUILD.bazel +++ b/qt/aqt/BUILD.bazel @@ -57,6 +57,7 @@ aqt_deps = [ "@bazel_tools//src/conditions:host_windows": [ requirement("psutil"), requirement("pywin32"), + requirement("winrt"), ], "//conditions:default": [], }) @@ -112,11 +113,14 @@ py_wheel( "pyqtwebengine", 'psutil; sys.platform == "win32"', 'pywin32; sys.platform == "win32"', + 'winrt==1.0.20239.1; sys.platform == "win32" and platform_release == "10" and python_version == "3.8"', + 'winrt; sys.platform == "win32" and platform_release == "10" and python_version >= "3.9"', "anki==" + anki_version, ], strip_path_prefixes = [ "qt/", ], + tags = ["manual"], version = anki_version, visibility = ["//visibility:public"], deps = [ diff --git a/qt/aqt/__init__.py b/qt/aqt/__init__.py index 37a580654..a2e10f122 100644 --- a/qt/aqt/__init__.py +++ b/qt/aqt/__init__.py @@ -37,7 +37,7 @@ appUpdate = "https://ankiweb.net/update/desktop" appHelpSite = HELP_SITE from aqt.main import AnkiQt # isort:skip -from aqt.profiles import ProfileManager, AnkiRestart # isort:skip +from aqt.profiles import ProfileManager, AnkiRestart, VideoDriver # isort:skip profiler: Optional[cProfile.Profile] = None mw: Optional[AnkiQt] = None # set on init @@ -69,7 +69,7 @@ except ImportError as e: # - make preferences modal? cmd+q does wrong thing -from aqt import addcards, browser, editcurrent # isort:skip +from aqt import addcards, addons, browser, editcurrent # isort:skip from aqt import stats, about, preferences, mediasync # isort:skip @@ -77,6 +77,7 @@ class DialogManager: _dialogs: Dict[str, list] = { "AddCards": [addcards.AddCards, None], + "AddonsDialog": [addons.AddonsDialog, None], "Browser": [browser.Browser, None], "EditCurrent": [editcurrent.EditCurrent, None], "DeckStats": [stats.DeckStats, None], @@ -326,7 +327,7 @@ def setupGL(pm): if isMac: return - mode = pm.glMode() + driver = pm.video_driver() # work around pyqt loading wrong GL library if isLin: @@ -366,22 +367,27 @@ def setupGL(pm): None, tr(TR.QT_MISC_ERROR), tr( - TR.QT_MISC_ERROR_LOADING_GRAPHICS_DRIVER, mode=mode, context=context + TR.QT_MISC_ERROR_LOADING_GRAPHICS_DRIVER, + mode=driver.value, + context=context, ), ) - pm.nextGlMode() + pm.set_video_driver(driver.next()) return else: print(f"Qt {category}: {msg} {context}") qInstallMessageHandler(msgHandler) - if mode == "auto": - return - elif isLin: - os.environ["QT_XCB_FORCE_SOFTWARE_OPENGL"] = "1" + if driver == VideoDriver.OpenGL: + pass else: - os.environ["QT_OPENGL"] = mode + if isWin: + os.environ["QT_OPENGL"] = driver.value + elif isMac: + QCoreApplication.setAttribute(Qt.AA_UseSoftwareOpenGL) + elif isLin: + os.environ["QT_XCB_FORCE_SOFTWARE_OPENGL"] = "1" PROFILE_CODE = os.environ.get("ANKI_PROFILE_CODE") @@ -548,11 +554,12 @@ def _run(argv=None, exec=True): # i18n & backend backend = setupLangAndBackend(pm, app, opts.lang, pmLoadResult.firstTime) - if isLin and pm.glMode() == "auto": + driver = pm.video_driver() + if isLin and driver == VideoDriver.OpenGL: from aqt.utils import gfxDriverIsBroken if gfxDriverIsBroken(): - pm.nextGlMode() + pm.set_video_driver(driver.next()) QMessageBox.critical( None, tr(TR.QT_MISC_ERROR), diff --git a/qt/aqt/about.py b/qt/aqt/about.py index adac5bc64..f61c6c83c 100644 --- a/qt/aqt/about.py +++ b/qt/aqt/about.py @@ -5,6 +5,7 @@ import platform import time import aqt.forms +from anki.lang import without_unicode_isolation from anki.utils import versionWithBuild from aqt.addons import AddonManager, AddonMeta from aqt.qt import * @@ -100,7 +101,10 @@ def show(mw): QT_VERSION_STR, PYQT_VERSION_STR, ) - abouttext += tr(TR.ABOUT_VISIT_WEBSITE, val=aqt.appWebsite) + "" + abouttext += ( + without_unicode_isolation(tr(TR.ABOUT_VISIT_WEBSITE, val=aqt.appWebsite)) + + "" + ) # automatically sorted; add new lines at the end allusers = sorted( diff --git a/qt/aqt/addons.py b/qt/aqt/addons.py index ab65e5903..f52084ef9 100644 --- a/qt/aqt/addons.py +++ b/qt/aqt/addons.py @@ -218,7 +218,7 @@ class AddonManager: ) def onAddonsDialog(self) -> None: - AddonsDialog(self) + aqt.dialogs.open("AddonsDialog", self) # Metadata ###################################################################### @@ -731,8 +731,12 @@ class AddonsDialog(QDialog): def reject(self) -> None: saveGeom(self, "addons") + aqt.dialogs.markClosed("AddonsDialog") + return QDialog.reject(self) + silentlyClose = True + def name_for_addon_list(self, addon: AddonMeta) -> str: name = addon.human_name() diff --git a/qt/aqt/browser.py b/qt/aqt/browser.py index e067b3f44..049aff1d3 100644 --- a/qt/aqt/browser.py +++ b/qt/aqt/browser.py @@ -6,6 +6,7 @@ from __future__ import annotations import html import re import time +from concurrent.futures import Future from dataclasses import dataclass from enum import Enum from operator import itemgetter @@ -810,7 +811,9 @@ class Browser(QMainWindow): c = self.card = self.mw.reviewer.card nid = c and c.nid or 0 if nid: - self.model.search("nid:%d" % nid) + search = "nid:%d" % nid + search = gui_hooks.default_search(search, c) + self.model.search(search) self.focusCid(c.id) else: self.model.search(self._lastSearchTxt) @@ -1661,8 +1664,11 @@ where id in %s""" self.editor.saveNow(self._clearUnusedTags) def _clearUnusedTags(self): - self.col.tags.registerNotes() - self.on_tag_list_update() + def on_done(fut: Future): + fut.result() + self.on_tag_list_update() + + self.mw.taskman.run_in_background(self.col.tags.registerNotes, on_done) # Suspending ###################################################################### diff --git a/qt/aqt/clayout.py b/qt/aqt/clayout.py index 3b793d5f8..14a95a39e 100644 --- a/qt/aqt/clayout.py +++ b/qt/aqt/clayout.py @@ -308,8 +308,8 @@ class CardLayout(QDialog): qconnect(pform.preview_settings.clicked, self.on_preview_settings) jsinc = [ - "js/vendor/jquery.js", - "js/vendor/browsersel.js", + "js/vendor/jquery.min.js", + "js/vendor/css_browser_selector.min.js", "js/mathjax.js", "js/vendor/mathjax/tex-chtml.js", "js/reviewer.js", diff --git a/qt/aqt/data/web/.prettierrc b/qt/aqt/data/web/.prettierrc new file mode 120000 index 000000000..d44059133 --- /dev/null +++ b/qt/aqt/data/web/.prettierrc @@ -0,0 +1 @@ +../../../../ts/.prettierrc \ No newline at end of file diff --git a/qt/aqt/data/web/css/editor.scss b/qt/aqt/data/web/css/editor.scss index 1b4da129f..8f768e96c 100644 --- a/qt/aqt/data/web/css/editor.scss +++ b/qt/aqt/data/web/css/editor.scss @@ -4,13 +4,17 @@ .field { border: 1px solid var(--border); background: var(--frame-bg); - color: var(--text-fg); padding: 5px; overflow-wrap: break-word; overflow: auto; + + &:empty::after { + content: "\A"; + white-space: pre; + } } -.clearfix:after { +.clearfix::after { content: ""; display: table; clear: both; diff --git a/qt/aqt/data/web/css/reviewer-bottom.scss b/qt/aqt/data/web/css/reviewer-bottom.scss index e7a414552..d9fa6c4ee 100644 --- a/qt/aqt/data/web/css/reviewer-bottom.scss +++ b/qt/aqt/data/web/css/reviewer-bottom.scss @@ -20,6 +20,10 @@ button { .stat { padding-top: 5px; + + @media (max-width: 583px) { + display: none; + } } .stat2 { @@ -78,3 +82,4 @@ button { border-top-color: var(--faint-border); } } + diff --git a/qt/aqt/data/web/js/BUILD.bazel b/qt/aqt/data/web/js/BUILD.bazel index 862363cb6..b47d90193 100644 --- a/qt/aqt/data/web/js/BUILD.bazel +++ b/qt/aqt/data/web/js/BUILD.bazel @@ -38,7 +38,7 @@ filegroup( prettier_test( name = "format_check", - srcs = glob(["*.ts"]), + srcs = glob(["*.ts", "*.js"]), ) # source files need fixing first diff --git a/qt/aqt/data/web/js/editor.ts b/qt/aqt/data/web/js/editor.ts index aafc63efb..bb6695044 100644 --- a/qt/aqt/data/web/js/editor.ts +++ b/qt/aqt/data/web/js/editor.ts @@ -54,12 +54,6 @@ function onKey(evt: KeyboardEvent) { currentField.blur(); return; } - // shift+tab goes to previous field - if (navigator.platform === "MacIntel" && evt.which === 9 && evt.shiftKey) { - evt.preventDefault(); - focusPrevious(); - return; - } // fix Ctrl+right/left handling in RTL fields if (currentField.dir === "rtl") { @@ -121,11 +115,6 @@ function inPreEnvironment() { } function onInput() { - // empty field? - if (currentField.innerHTML === "") { - currentField.innerHTML = "
"; - } - // make sure IME changes get saved triggerKeyTimer(); } @@ -206,16 +195,6 @@ function focusField(n) { $("#f" + n).focus(); } -function focusPrevious() { - if (!currentField) { - return; - } - const previous = currentFieldOrdinal() - 1; - if (previous >= 0) { - focusField(previous); - } -} - function focusIfField(x, y) { const elements = document.elementsFromPoint(x, y); for (let i = 0; i < elements.length; i++) { @@ -343,15 +322,19 @@ function onCutOrCopy() { function setFields(fields) { let txt = ""; + // webengine will include the variable after enter+backspace + // if we don't convert it to a literal colour + const color = window + .getComputedStyle(document.documentElement) + .getPropertyValue("--text-fg"); for (let i = 0; i < fields.length; i++) { const n = fields[i][0]; let f = fields[i][1]; - if (!f) { - f = "
"; - } txt += ` - ${n} + + ${n} + @@ -367,6 +350,7 @@ function setFields(fields) { oncut='onCutOrCopy(this);' contentEditable=true class=field + style='color: ${color}' >${f} `; @@ -408,20 +392,12 @@ function hideDupes() { $("#dupes").hide(); } -/// If the field has only an empty br, remove it first. -let insertHtmlRemovingInitialBR = function (html: string) { - if (html !== "") { - // remove
in empty field - if (currentField && currentField.innerHTML === "
") { - currentField.innerHTML = ""; - } - setFormat("inserthtml", html); - } -}; - let pasteHTML = function (html, internal, extendedMode) { html = filterHTML(html, internal, extendedMode); - insertHtmlRemovingInitialBR(html); + + if (html !== "") { + setFormat("inserthtml", html); + } }; let filterHTML = function (html, internal, extendedMode) { diff --git a/qt/aqt/data/web/js/mathjax.js b/qt/aqt/data/web/js/mathjax.js index c863939c1..f5d99fb84 100644 --- a/qt/aqt/data/web/js/mathjax.js +++ b/qt/aqt/data/web/js/mathjax.js @@ -1,27 +1,27 @@ window.MathJax = { - tex: { - displayMath: [["\\[", "\\]"]], - processRefs: false, - processEnvironments: false, - packages: { - "[+]": ["noerrors", "mhchem"], + tex: { + displayMath: [["\\[", "\\]"]], + processRefs: false, + processEnvironments: false, + packages: { + "[+]": ["noerrors", "mhchem"], + }, }, - }, - startup: { - typeset: false, - pageReady: () => { - return MathJax.startup.defaultPageReady(); + startup: { + typeset: false, + pageReady: () => { + return MathJax.startup.defaultPageReady(); + }, }, - }, - options: { - renderActions: { - addMenu: [], - checkLoading: [], + options: { + renderActions: { + addMenu: [], + checkLoading: [], + }, + ignoreHtmlClass: "tex2jax_ignore", + processHtmlClass: "tex2jax_process", + }, + loader: { + load: ["[tex]/noerrors", "[tex]/mhchem"], }, - ignoreHtmlClass: "tex2jax_ignore", - processHtmlClass: "tex2jax_process", - }, - loader: { - load: ["[tex]/noerrors", "[tex]/mhchem"], - }, }; diff --git a/qt/aqt/data/web/js/reviewer.ts b/qt/aqt/data/web/js/reviewer.ts index d1e6c8c29..0ba011729 100644 --- a/qt/aqt/data/web/js/reviewer.ts +++ b/qt/aqt/data/web/js/reviewer.ts @@ -1,17 +1,21 @@ /* Copyright: Ankitects Pty Ltd and contributors * License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html */ +declare var MathJax: any; + +type Callback = () => void | Promise; + var ankiPlatform = "desktop"; var typeans; -var _updatingQA = false; +var _updatingQueue: Promise = Promise.resolve(); -var qFade = 100; +var qFade = 50; var aFade = 0; -var onUpdateHook; -var onShownHook; +var onUpdateHook: Array; +var onShownHook: Array; -function _runHook(arr: () => Promise[]): Promise { +function _runHook(arr: Array): Promise { var promises = []; for (var i = 0; i < arr.length; i++) { @@ -21,92 +25,91 @@ function _runHook(arr: () => Promise[]): Promise { return Promise.all(promises); } -function _updateQA(html, fadeTime, onupdate, onshown) { - // if a request to update q/a comes in before the previous content - // has been loaded, wait a while and try again - if (_updatingQA) { - setTimeout(function () { - _updateQA(html, fadeTime, onupdate, onshown); - }, 50); - return; - } - - _updatingQA = true; +function _queueAction(action: Callback): void { + _updatingQueue = _updatingQueue.then(action); +} +async function _updateQA( + html: string, + fadeTime: number, + onupdate: Callback, + onshown: Callback +): Promise { onUpdateHook = [onupdate]; onShownHook = [onshown]; var qa = $("#qa"); // fade out current text - new Promise((resolve) => qa.fadeTo(fadeTime, 0, () => resolve())) - // update text - .then(() => { - try { - qa.html(html); - } catch (err) { - qa.html( - ( - `Invalid HTML on card: ${String(err).substring(0, 2000)}\n` + - String(err.stack).substring(0, 2000) - ).replace(/\n/g, "
") - ); - } - }) - .then(() => _runHook(onUpdateHook)) - .then(() => - // @ts-ignore wait for mathjax to ready - MathJax.startup.promise.then(() => { - // @ts-ignore clear MathJax buffer - MathJax.typesetClear(); + await qa.fadeTo(fadeTime, 0).promise(); - // @ts-ignore typeset - return MathJax.typesetPromise(qa.slice(0, 1)); - }) - ) - // and reveal when processing is done - .then(() => new Promise((resolve) => qa.fadeTo(fadeTime, 1, () => resolve()))) - .then(() => _runHook(onShownHook)) - .then(() => (_updatingQA = false)); + // update text + try { + qa.html(html); + } catch (err) { + qa.html( + ( + `Invalid HTML on card: ${String(err).substring(0, 2000)}\n` + + String(err.stack).substring(0, 2000) + ).replace(/\n/g, "
") + ); + } + await _runHook(onUpdateHook); + + // wait for mathjax to ready + await MathJax.startup.promise.then(() => { + // clear MathJax buffers from previous typesets + MathJax.typesetClear(); + + return MathJax.typesetPromise(qa.slice(0, 1)); + }); + + // and reveal when processing is done + await qa.fadeTo(fadeTime, 1).promise(); + await _runHook(onShownHook); } -function _showQuestion(q, bodyclass) { - _updateQA( - q, - qFade, - function () { - // return to top of window - window.scrollTo(0, 0); +function _showQuestion(q: string, bodyclass: string): void { + _queueAction(() => + _updateQA( + q, + qFade, + function () { + // return to top of window + window.scrollTo(0, 0); - document.body.className = bodyclass; - }, - function () { - // focus typing area if visible - typeans = document.getElementById("typeans"); - if (typeans) { - typeans.focus(); + document.body.className = bodyclass; + }, + function () { + // focus typing area if visible + typeans = document.getElementById("typeans"); + if (typeans) { + typeans.focus(); + } } - } + ) ); } -function _showAnswer(a, bodyclass) { - _updateQA( - a, - aFade, - function () { - if (bodyclass) { - // when previewing - document.body.className = bodyclass; - } +function _showAnswer(a: string, bodyclass: string): void { + _queueAction(() => + _updateQA( + a, + aFade, + function () { + if (bodyclass) { + // when previewing + document.body.className = bodyclass; + } - // scroll to answer? - var e = $("#answer"); - if (e[0]) { - e[0].scrollIntoView(); - } - }, - function () {} + // scroll to answer? + var e = $("#answer"); + if (e[0]) { + e[0].scrollIntoView(); + } + }, + function () {} + ) ); } @@ -117,7 +120,7 @@ const _flagColours = { 4: "#77aaff", }; -function _drawFlag(flag) { +function _drawFlag(flag: 0 | 1 | 2 | 3 | 4): void { var elem = $("#_flag"); if (flag === 0) { elem.hide(); @@ -127,7 +130,7 @@ function _drawFlag(flag) { elem.css("color", _flagColours[flag]); } -function _drawMark(mark) { +function _drawMark(mark: boolean): void { var elem = $("#_mark"); if (!mark) { elem.hide(); @@ -136,13 +139,13 @@ function _drawMark(mark) { } } -function _typeAnsPress() { +function _typeAnsPress(): void { if ((window.event as KeyboardEvent).keyCode === 13) { pycmd("ans"); } } -function _emulateMobile(enabled: boolean) { +function _emulateMobile(enabled: boolean): void { const list = document.documentElement.classList; if (enabled) { list.add("mobile"); diff --git a/qt/aqt/data/web/js/vendor/BUILD.bazel b/qt/aqt/data/web/js/vendor/BUILD.bazel index 2bf378b68..f12e3be27 100644 --- a/qt/aqt/data/web/js/vendor/BUILD.bazel +++ b/qt/aqt/data/web/js/vendor/BUILD.bazel @@ -1,5 +1,28 @@ +load("//ts:vendor.bzl", "copy_css_browser_selector", "copy_jquery", "copy_jquery_ui", "copy_protobufjs") + +copy_jquery(name = "jquery") + +copy_jquery_ui(name = "jquery-ui") + +copy_protobufjs(name = "protobufjs") + +copy_css_browser_selector(name = "css-browser-selector") + +files = [ + "jquery", + "jquery-ui", + "protobufjs", + "css-browser-selector", +] + +directories = [ + "mathjax", +] + filegroup( name = "vendor", - srcs = glob(["*.js"]) + ["//qt/aqt/data/web/js/vendor/mathjax"], + srcs = glob(["*.js"]) + + ["//qt/aqt/data/web/js/vendor:{}".format(file) for file in files] + + ["//qt/aqt/data/web/js/vendor/{}".format(dir) for dir in directories], visibility = ["//qt:__subpackages__"], ) diff --git a/qt/aqt/data/web/js/vendor/browsersel.js b/qt/aqt/data/web/js/vendor/browsersel.js deleted file mode 100644 index 9c50762ca..000000000 --- a/qt/aqt/data/web/js/vendor/browsersel.js +++ /dev/null @@ -1 +0,0 @@ -/* CSS Browser Selector v0.4.0 (Nov 02, 2010) Rafael Lima (http://rafael.adm.br). CC BY 2.5. */function css_browser_selector(u){var ua=u.toLowerCase(),is=function(t){return ua.indexOf(t)>-1},g='gecko',w='webkit',s='safari',o='opera',m='mobile',h=document.documentElement,b=[(!(/opera|webtv/i.test(ua))&&/msie\s(\d)/.test(ua))?('ie ie'+RegExp.$1):is('firefox/2')?g+' ff2':is('firefox/3.5')?g+' ff3 ff3_5':is('firefox/3.6')?g+' ff3 ff3_6':is('firefox/3')?g+' ff3':is('gecko/')?g:is('opera')?o+(/version\/(\d+)/.test(ua)?' '+o+RegExp.$1:(/opera(\s|\/)(\d+)/.test(ua)?' '+o+RegExp.$2:'')):is('konqueror')?'konqueror':is('blackberry')?m+' blackberry':is('android')?m+' android':is('chrome')?w+' chrome':is('iron')?w+' iron':is('applewebkit/')?w+' '+s+(/version\/(\d+)/.test(ua)?' '+s+RegExp.$1:''):is('mozilla/')?g:'',is('j2me')?m+' j2me':is('iphone')?m+' iphone':is('ipod')?m+' ipod':is('ipad')?m+' ipad':is('mac')?'mac':is('darwin')?'mac':is('webtv')?'webtv':is('win')?'win'+(is('windows nt 6.0')?' vista':''):is('freebsd')?'freebsd':(is('x11')||is('linux'))?'linux':'','js']; c = b.join(' '); h.className += ' '+c; return c;}; css_browser_selector(navigator.userAgent); diff --git a/qt/aqt/data/web/js/vendor/jquery-ui.js b/qt/aqt/data/web/js/vendor/jquery-ui.js deleted file mode 100644 index 0245f83b5..000000000 --- a/qt/aqt/data/web/js/vendor/jquery-ui.js +++ /dev/null @@ -1,13 +0,0 @@ -/*! jQuery UI - v1.11.4 - 2015-03-11 -* http://jqueryui.com -* Includes: core.js, widget.js, mouse.js, position.js, accordion.js, autocomplete.js, button.js, datepicker.js, dialog.js, draggable.js, droppable.js, effect.js, effect-blind.js, effect-bounce.js, effect-clip.js, effect-drop.js, effect-explode.js, effect-fade.js, effect-fold.js, effect-highlight.js, effect-puff.js, effect-pulsate.js, effect-scale.js, effect-shake.js, effect-size.js, effect-slide.js, effect-transfer.js, menu.js, progressbar.js, resizable.js, selectable.js, selectmenu.js, slider.js, sortable.js, spinner.js, tabs.js, tooltip.js -* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */ - -(function(e){"function"==typeof define&&define.amd?define(["jquery"],e):e(jQuery)})(function(e){function t(t,s){var n,a,o,r=t.nodeName.toLowerCase();return"area"===r?(n=t.parentNode,a=n.name,t.href&&a&&"map"===n.nodeName.toLowerCase()?(o=e("img[usemap='#"+a+"']")[0],!!o&&i(o)):!1):(/^(input|select|textarea|button|object)$/.test(r)?!t.disabled:"a"===r?t.href||s:s)&&i(t)}function i(t){return e.expr.filters.visible(t)&&!e(t).parents().addBack().filter(function(){return"hidden"===e.css(this,"visibility")}).length}function s(e){for(var t,i;e.length&&e[0]!==document;){if(t=e.css("position"),("absolute"===t||"relative"===t||"fixed"===t)&&(i=parseInt(e.css("zIndex"),10),!isNaN(i)&&0!==i))return i;e=e.parent()}return 0}function n(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},e.extend(this._defaults,this.regional[""]),this.regional.en=e.extend(!0,{},this.regional[""]),this.regional["en-US"]=e.extend(!0,{},this.regional.en),this.dpDiv=a(e("

"))}function a(t){var i="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return t.delegate(i,"mouseout",function(){e(this).removeClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&e(this).removeClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&e(this).removeClass("ui-datepicker-next-hover")}).delegate(i,"mouseover",o)}function o(){e.datepicker._isDisabledDatepicker(v.inline?v.dpDiv.parent()[0]:v.input[0])||(e(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),e(this).addClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&e(this).addClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&e(this).addClass("ui-datepicker-next-hover"))}function r(t,i){e.extend(t,i);for(var s in i)null==i[s]&&(t[s]=i[s]);return t}function h(e){return function(){var t=this.element.val();e.apply(this,arguments),this._refresh(),t!==this.element.val()&&this._trigger("change")}}e.ui=e.ui||{},e.extend(e.ui,{version:"1.11.4",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),e.fn.extend({scrollParent:function(t){var i=this.css("position"),s="absolute"===i,n=t?/(auto|scroll|hidden)/:/(auto|scroll)/,a=this.parents().filter(function(){var t=e(this);return s&&"static"===t.css("position")?!1:n.test(t.css("overflow")+t.css("overflow-y")+t.css("overflow-x"))}).eq(0);return"fixed"!==i&&a.length?a:e(this[0].ownerDocument||document)},uniqueId:function(){var e=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++e)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&e(this).removeAttr("id")})}}),e.extend(e.expr[":"],{data:e.expr.createPseudo?e.expr.createPseudo(function(t){return function(i){return!!e.data(i,t)}}):function(t,i,s){return!!e.data(t,s[3])},focusable:function(i){return t(i,!isNaN(e.attr(i,"tabindex")))},tabbable:function(i){var s=e.attr(i,"tabindex"),n=isNaN(s);return(n||s>=0)&&t(i,!n)}}),e("").outerWidth(1).jquery||e.each(["Width","Height"],function(t,i){function s(t,i,s,a){return e.each(n,function(){i-=parseFloat(e.css(t,"padding"+this))||0,s&&(i-=parseFloat(e.css(t,"border"+this+"Width"))||0),a&&(i-=parseFloat(e.css(t,"margin"+this))||0)}),i}var n="Width"===i?["Left","Right"]:["Top","Bottom"],a=i.toLowerCase(),o={innerWidth:e.fn.innerWidth,innerHeight:e.fn.innerHeight,outerWidth:e.fn.outerWidth,outerHeight:e.fn.outerHeight};e.fn["inner"+i]=function(t){return void 0===t?o["inner"+i].call(this):this.each(function(){e(this).css(a,s(this,t)+"px")})},e.fn["outer"+i]=function(t,n){return"number"!=typeof t?o["outer"+i].call(this,t):this.each(function(){e(this).css(a,s(this,t,!0,n)+"px")})}}),e.fn.addBack||(e.fn.addBack=function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}),e("").data("a-b","a").removeData("a-b").data("a-b")&&(e.fn.removeData=function(t){return function(i){return arguments.length?t.call(this,e.camelCase(i)):t.call(this)}}(e.fn.removeData)),e.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase()),e.fn.extend({focus:function(t){return function(i,s){return"number"==typeof i?this.each(function(){var t=this;setTimeout(function(){e(t).focus(),s&&s.call(t)},i)}):t.apply(this,arguments)}}(e.fn.focus),disableSelection:function(){var e="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.bind(e+".ui-disableSelection",function(e){e.preventDefault()})}}(),enableSelection:function(){return this.unbind(".ui-disableSelection")},zIndex:function(t){if(void 0!==t)return this.css("zIndex",t);if(this.length)for(var i,s,n=e(this[0]);n.length&&n[0]!==document;){if(i=n.css("position"),("absolute"===i||"relative"===i||"fixed"===i)&&(s=parseInt(n.css("zIndex"),10),!isNaN(s)&&0!==s))return s;n=n.parent()}return 0}}),e.ui.plugin={add:function(t,i,s){var n,a=e.ui[t].prototype;for(n in s)a.plugins[n]=a.plugins[n]||[],a.plugins[n].push([i,s[n]])},call:function(e,t,i,s){var n,a=e.plugins[t];if(a&&(s||e.element[0].parentNode&&11!==e.element[0].parentNode.nodeType))for(n=0;a.length>n;n++)e.options[a[n][0]]&&a[n][1].apply(e.element,i)}};var l=0,u=Array.prototype.slice;e.cleanData=function(t){return function(i){var s,n,a;for(a=0;null!=(n=i[a]);a++)try{s=e._data(n,"events"),s&&s.remove&&e(n).triggerHandler("remove")}catch(o){}t(i)}}(e.cleanData),e.widget=function(t,i,s){var n,a,o,r,h={},l=t.split(".")[0];return t=t.split(".")[1],n=l+"-"+t,s||(s=i,i=e.Widget),e.expr[":"][n.toLowerCase()]=function(t){return!!e.data(t,n)},e[l]=e[l]||{},a=e[l][t],o=e[l][t]=function(e,t){return this._createWidget?(arguments.length&&this._createWidget(e,t),void 0):new o(e,t)},e.extend(o,a,{version:s.version,_proto:e.extend({},s),_childConstructors:[]}),r=new i,r.options=e.widget.extend({},r.options),e.each(s,function(t,s){return e.isFunction(s)?(h[t]=function(){var e=function(){return i.prototype[t].apply(this,arguments)},n=function(e){return i.prototype[t].apply(this,e)};return function(){var t,i=this._super,a=this._superApply;return this._super=e,this._superApply=n,t=s.apply(this,arguments),this._super=i,this._superApply=a,t}}(),void 0):(h[t]=s,void 0)}),o.prototype=e.widget.extend(r,{widgetEventPrefix:a?r.widgetEventPrefix||t:t},h,{constructor:o,namespace:l,widgetName:t,widgetFullName:n}),a?(e.each(a._childConstructors,function(t,i){var s=i.prototype;e.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete a._childConstructors):i._childConstructors.push(o),e.widget.bridge(t,o),o},e.widget.extend=function(t){for(var i,s,n=u.call(arguments,1),a=0,o=n.length;o>a;a++)for(i in n[a])s=n[a][i],n[a].hasOwnProperty(i)&&void 0!==s&&(t[i]=e.isPlainObject(s)?e.isPlainObject(t[i])?e.widget.extend({},t[i],s):e.widget.extend({},s):s);return t},e.widget.bridge=function(t,i){var s=i.prototype.widgetFullName||t;e.fn[t]=function(n){var a="string"==typeof n,o=u.call(arguments,1),r=this;return a?this.each(function(){var i,a=e.data(this,s);return"instance"===n?(r=a,!1):a?e.isFunction(a[n])&&"_"!==n.charAt(0)?(i=a[n].apply(a,o),i!==a&&void 0!==i?(r=i&&i.jquery?r.pushStack(i.get()):i,!1):void 0):e.error("no such method '"+n+"' for "+t+" widget instance"):e.error("cannot call methods on "+t+" prior to initialization; "+"attempted to call method '"+n+"'")}):(o.length&&(n=e.widget.extend.apply(null,[n].concat(o))),this.each(function(){var t=e.data(this,s);t?(t.option(n||{}),t._init&&t._init()):e.data(this,s,new i(n,this))})),r}},e.Widget=function(){},e.Widget._childConstructors=[],e.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"
",options:{disabled:!1,create:null},_createWidget:function(t,i){i=e(i||this.defaultElement||this)[0],this.element=e(i),this.uuid=l++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=e(),this.hoverable=e(),this.focusable=e(),i!==this&&(e.data(i,this.widgetFullName,this),this._on(!0,this.element,{remove:function(e){e.target===i&&this.destroy()}}),this.document=e(i.style?i.ownerDocument:i.document||i),this.window=e(this.document[0].defaultView||this.document[0].parentWindow)),this.options=e.widget.extend({},this.options,this._getCreateOptions(),t),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:e.noop,_getCreateEventData:e.noop,_create:e.noop,_init:e.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetFullName).removeData(e.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:e.noop,widget:function(){return this.element},option:function(t,i){var s,n,a,o=t;if(0===arguments.length)return e.widget.extend({},this.options);if("string"==typeof t)if(o={},s=t.split("."),t=s.shift(),s.length){for(n=o[t]=e.widget.extend({},this.options[t]),a=0;s.length-1>a;a++)n[s[a]]=n[s[a]]||{},n=n[s[a]];if(t=s.pop(),1===arguments.length)return void 0===n[t]?null:n[t];n[t]=i}else{if(1===arguments.length)return void 0===this.options[t]?null:this.options[t];o[t]=i}return this._setOptions(o),this},_setOptions:function(e){var t;for(t in e)this._setOption(t,e[t]);return this},_setOption:function(e,t){return this.options[e]=t,"disabled"===e&&(this.widget().toggleClass(this.widgetFullName+"-disabled",!!t),t&&(this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus"))),this},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_on:function(t,i,s){var n,a=this;"boolean"!=typeof t&&(s=i,i=t,t=!1),s?(i=n=e(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),e.each(s,function(s,o){function r(){return t||a.options.disabled!==!0&&!e(this).hasClass("ui-state-disabled")?("string"==typeof o?a[o]:o).apply(a,arguments):void 0}"string"!=typeof o&&(r.guid=o.guid=o.guid||r.guid||e.guid++);var h=s.match(/^([\w:-]*)\s*(.*)$/),l=h[1]+a.eventNamespace,u=h[2];u?n.delegate(u,l,r):i.bind(l,r)})},_off:function(t,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,t.unbind(i).undelegate(i),this.bindings=e(this.bindings.not(t).get()),this.focusable=e(this.focusable.not(t).get()),this.hoverable=e(this.hoverable.not(t).get())},_delay:function(e,t){function i(){return("string"==typeof e?s[e]:e).apply(s,arguments)}var s=this;return setTimeout(i,t||0)},_hoverable:function(t){this.hoverable=this.hoverable.add(t),this._on(t,{mouseenter:function(t){e(t.currentTarget).addClass("ui-state-hover")},mouseleave:function(t){e(t.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(t){this.focusable=this.focusable.add(t),this._on(t,{focusin:function(t){e(t.currentTarget).addClass("ui-state-focus")},focusout:function(t){e(t.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(t,i,s){var n,a,o=this.options[t];if(s=s||{},i=e.Event(i),i.type=(t===this.widgetEventPrefix?t:this.widgetEventPrefix+t).toLowerCase(),i.target=this.element[0],a=i.originalEvent)for(n in a)n in i||(i[n]=a[n]);return this.element.trigger(i,s),!(e.isFunction(o)&&o.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},e.each({show:"fadeIn",hide:"fadeOut"},function(t,i){e.Widget.prototype["_"+t]=function(s,n,a){"string"==typeof n&&(n={effect:n});var o,r=n?n===!0||"number"==typeof n?i:n.effect||i:t;n=n||{},"number"==typeof n&&(n={duration:n}),o=!e.isEmptyObject(n),n.complete=a,n.delay&&s.delay(n.delay),o&&e.effects&&e.effects.effect[r]?s[t](n):r!==t&&s[r]?s[r](n.duration,n.easing,a):s.queue(function(i){e(this)[t](),a&&a.call(s[0]),i()})}}),e.widget;var d=!1;e(document).mouseup(function(){d=!1}),e.widget("ui.mouse",{version:"1.11.4",options:{cancel:"input,textarea,button,select,option",distance:1,delay:0},_mouseInit:function(){var t=this;this.element.bind("mousedown."+this.widgetName,function(e){return t._mouseDown(e)}).bind("click."+this.widgetName,function(i){return!0===e.data(i.target,t.widgetName+".preventClickEvent")?(e.removeData(i.target,t.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),this._mouseMoveDelegate&&this.document.unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(t){if(!d){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(t),this._mouseDownEvent=t;var i=this,s=1===t.which,n="string"==typeof this.options.cancel&&t.target.nodeName?e(t.target).closest(this.options.cancel).length:!1;return s&&!n&&this._mouseCapture(t)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){i.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=this._mouseStart(t)!==!1,!this._mouseStarted)?(t.preventDefault(),!0):(!0===e.data(t.target,this.widgetName+".preventClickEvent")&&e.removeData(t.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(e){return i._mouseMove(e)},this._mouseUpDelegate=function(e){return i._mouseUp(e)},this.document.bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),t.preventDefault(),d=!0,!0)):!0}},_mouseMove:function(t){if(this._mouseMoved){if(e.ui.ie&&(!document.documentMode||9>document.documentMode)&&!t.button)return this._mouseUp(t);if(!t.which)return this._mouseUp(t)}return(t.which||t.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(t),t.preventDefault()):(this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,t)!==!1,this._mouseStarted?this._mouseDrag(t):this._mouseUp(t)),!this._mouseStarted)},_mouseUp:function(t){return this.document.unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,t.target===this._mouseDownEvent.target&&e.data(t.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(t)),d=!1,!1},_mouseDistanceMet:function(e){return Math.max(Math.abs(this._mouseDownEvent.pageX-e.pageX),Math.abs(this._mouseDownEvent.pageY-e.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),function(){function t(e,t,i){return[parseFloat(e[0])*(p.test(e[0])?t/100:1),parseFloat(e[1])*(p.test(e[1])?i/100:1)]}function i(t,i){return parseInt(e.css(t,i),10)||0}function s(t){var i=t[0];return 9===i.nodeType?{width:t.width(),height:t.height(),offset:{top:0,left:0}}:e.isWindow(i)?{width:t.width(),height:t.height(),offset:{top:t.scrollTop(),left:t.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:t.outerWidth(),height:t.outerHeight(),offset:t.offset()}}e.ui=e.ui||{};var n,a,o=Math.max,r=Math.abs,h=Math.round,l=/left|center|right/,u=/top|center|bottom/,d=/[\+\-]\d+(\.[\d]+)?%?/,c=/^\w+/,p=/%$/,f=e.fn.position;e.position={scrollbarWidth:function(){if(void 0!==n)return n;var t,i,s=e("
"),a=s.children()[0];return e("body").append(s),t=a.offsetWidth,s.css("overflow","scroll"),i=a.offsetWidth,t===i&&(i=s[0].clientWidth),s.remove(),n=t-i},getScrollInfo:function(t){var i=t.isWindow||t.isDocument?"":t.element.css("overflow-x"),s=t.isWindow||t.isDocument?"":t.element.css("overflow-y"),n="scroll"===i||"auto"===i&&t.widthi?"left":t>0?"right":"center",vertical:0>a?"top":s>0?"bottom":"middle"};d>m&&m>r(t+i)&&(h.horizontal="center"),c>g&&g>r(s+a)&&(h.vertical="middle"),h.important=o(r(t),r(i))>o(r(s),r(a))?"horizontal":"vertical",n.using.call(this,e,h)}),u.offset(e.extend(M,{using:l}))})},e.ui.position={fit:{left:function(e,t){var i,s=t.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=e.left-t.collisionPosition.marginLeft,h=n-r,l=r+t.collisionWidth-a-n;t.collisionWidth>a?h>0&&0>=l?(i=e.left+h+t.collisionWidth-a-n,e.left+=h-i):e.left=l>0&&0>=h?n:h>l?n+a-t.collisionWidth:n:h>0?e.left+=h:l>0?e.left-=l:e.left=o(e.left-r,e.left)},top:function(e,t){var i,s=t.within,n=s.isWindow?s.scrollTop:s.offset.top,a=t.within.height,r=e.top-t.collisionPosition.marginTop,h=n-r,l=r+t.collisionHeight-a-n;t.collisionHeight>a?h>0&&0>=l?(i=e.top+h+t.collisionHeight-a-n,e.top+=h-i):e.top=l>0&&0>=h?n:h>l?n+a-t.collisionHeight:n:h>0?e.top+=h:l>0?e.top-=l:e.top=o(e.top-r,e.top)}},flip:{left:function(e,t){var i,s,n=t.within,a=n.offset.left+n.scrollLeft,o=n.width,h=n.isWindow?n.scrollLeft:n.offset.left,l=e.left-t.collisionPosition.marginLeft,u=l-h,d=l+t.collisionWidth-o-h,c="left"===t.my[0]?-t.elemWidth:"right"===t.my[0]?t.elemWidth:0,p="left"===t.at[0]?t.targetWidth:"right"===t.at[0]?-t.targetWidth:0,f=-2*t.offset[0];0>u?(i=e.left+c+p+f+t.collisionWidth-o-a,(0>i||r(u)>i)&&(e.left+=c+p+f)):d>0&&(s=e.left-t.collisionPosition.marginLeft+c+p+f-h,(s>0||d>r(s))&&(e.left+=c+p+f))},top:function(e,t){var i,s,n=t.within,a=n.offset.top+n.scrollTop,o=n.height,h=n.isWindow?n.scrollTop:n.offset.top,l=e.top-t.collisionPosition.marginTop,u=l-h,d=l+t.collisionHeight-o-h,c="top"===t.my[1],p=c?-t.elemHeight:"bottom"===t.my[1]?t.elemHeight:0,f="top"===t.at[1]?t.targetHeight:"bottom"===t.at[1]?-t.targetHeight:0,m=-2*t.offset[1];0>u?(s=e.top+p+f+m+t.collisionHeight-o-a,(0>s||r(u)>s)&&(e.top+=p+f+m)):d>0&&(i=e.top-t.collisionPosition.marginTop+p+f+m-h,(i>0||d>r(i))&&(e.top+=p+f+m))}},flipfit:{left:function(){e.ui.position.flip.left.apply(this,arguments),e.ui.position.fit.left.apply(this,arguments)},top:function(){e.ui.position.flip.top.apply(this,arguments),e.ui.position.fit.top.apply(this,arguments)}}},function(){var t,i,s,n,o,r=document.getElementsByTagName("body")[0],h=document.createElement("div");t=document.createElement(r?"div":"body"),s={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},r&&e.extend(s,{position:"absolute",left:"-1000px",top:"-1000px"});for(o in s)t.style[o]=s[o];t.appendChild(h),i=r||document.documentElement,i.insertBefore(t,i.firstChild),h.style.cssText="position: absolute; left: 10.7432222px;",n=e(h).offset().left,a=n>10&&11>n,t.innerHTML="",i.removeChild(t)}()}(),e.ui.position,e.widget("ui.accordion",{version:"1.11.4",options:{active:0,animate:{},collapsible:!1,event:"click",header:"> li > :first-child,> :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},hideProps:{borderTopWidth:"hide",borderBottomWidth:"hide",paddingTop:"hide",paddingBottom:"hide",height:"hide"},showProps:{borderTopWidth:"show",borderBottomWidth:"show",paddingTop:"show",paddingBottom:"show",height:"show"},_create:function(){var t=this.options;this.prevShow=this.prevHide=e(),this.element.addClass("ui-accordion ui-widget ui-helper-reset").attr("role","tablist"),t.collapsible||t.active!==!1&&null!=t.active||(t.active=0),this._processPanels(),0>t.active&&(t.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():e()}},_createIcons:function(){var t=this.options.icons;t&&(e("").addClass("ui-accordion-header-icon ui-icon "+t.header).prependTo(this.headers),this.active.children(".ui-accordion-header-icon").removeClass(t.header).addClass(t.activeHeader),this.headers.addClass("ui-accordion-icons"))},_destroyIcons:function(){this.headers.removeClass("ui-accordion-icons").children(".ui-accordion-header-icon").remove()},_destroy:function(){var e;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role"),this.headers.removeClass("ui-accordion-header ui-accordion-header-active ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-selected").removeAttr("aria-controls").removeAttr("tabIndex").removeUniqueId(),this._destroyIcons(),e=this.headers.next().removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-state-disabled").css("display","").removeAttr("role").removeAttr("aria-hidden").removeAttr("aria-labelledby").removeUniqueId(),"content"!==this.options.heightStyle&&e.css("height","")},_setOption:function(e,t){return"active"===e?(this._activate(t),void 0):("event"===e&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(t)),this._super(e,t),"collapsible"!==e||t||this.options.active!==!1||this._activate(0),"icons"===e&&(this._destroyIcons(),t&&this._createIcons()),"disabled"===e&&(this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this.headers.add(this.headers.next()).toggleClass("ui-state-disabled",!!t)),void 0)},_keydown:function(t){if(!t.altKey&&!t.ctrlKey){var i=e.ui.keyCode,s=this.headers.length,n=this.headers.index(t.target),a=!1;switch(t.keyCode){case i.RIGHT:case i.DOWN:a=this.headers[(n+1)%s];break;case i.LEFT:case i.UP:a=this.headers[(n-1+s)%s];break;case i.SPACE:case i.ENTER:this._eventHandler(t);break;case i.HOME:a=this.headers[0];break;case i.END:a=this.headers[s-1]}a&&(e(t.target).attr("tabIndex",-1),e(a).attr("tabIndex",0),a.focus(),t.preventDefault())}},_panelKeyDown:function(t){t.keyCode===e.ui.keyCode.UP&&t.ctrlKey&&e(t.currentTarget).prev().focus()},refresh:function(){var t=this.options;this._processPanels(),t.active===!1&&t.collapsible===!0||!this.headers.length?(t.active=!1,this.active=e()):t.active===!1?this._activate(0):this.active.length&&!e.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(t.active=!1,this.active=e()):this._activate(Math.max(0,t.active-1)):t.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){var e=this.headers,t=this.panels;this.headers=this.element.find(this.options.header).addClass("ui-accordion-header ui-state-default ui-corner-all"),this.panels=this.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom").filter(":not(.ui-accordion-content-active)").hide(),t&&(this._off(e.not(this.headers)),this._off(t.not(this.panels)))},_refresh:function(){var t,i=this.options,s=i.heightStyle,n=this.element.parent();this.active=this._findActive(i.active).addClass("ui-accordion-header-active ui-state-active ui-corner-top").removeClass("ui-corner-all"),this.active.next().addClass("ui-accordion-content-active").show(),this.headers.attr("role","tab").each(function(){var t=e(this),i=t.uniqueId().attr("id"),s=t.next(),n=s.uniqueId().attr("id");t.attr("aria-controls",n),s.attr("aria-labelledby",i)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(i.event),"fill"===s?(t=n.height(),this.element.siblings(":visible").each(function(){var i=e(this),s=i.css("position");"absolute"!==s&&"fixed"!==s&&(t-=i.outerHeight(!0))}),this.headers.each(function(){t-=e(this).outerHeight(!0)}),this.headers.next().each(function(){e(this).height(Math.max(0,t-e(this).innerHeight()+e(this).height()))}).css("overflow","auto")):"auto"===s&&(t=0,this.headers.next().each(function(){t=Math.max(t,e(this).css("height","").height())}).height(t))},_activate:function(t){var i=this._findActive(t)[0];i!==this.active[0]&&(i=i||this.active[0],this._eventHandler({target:i,currentTarget:i,preventDefault:e.noop}))},_findActive:function(t){return"number"==typeof t?this.headers.eq(t):e()},_setupEvents:function(t){var i={keydown:"_keydown"};t&&e.each(t.split(" "),function(e,t){i[t]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(t){var i=this.options,s=this.active,n=e(t.currentTarget),a=n[0]===s[0],o=a&&i.collapsible,r=o?e():n.next(),h=s.next(),l={oldHeader:s,oldPanel:h,newHeader:o?e():n,newPanel:r};t.preventDefault(),a&&!i.collapsible||this._trigger("beforeActivate",t,l)===!1||(i.active=o?!1:this.headers.index(n),this.active=a?e():n,this._toggle(l),s.removeClass("ui-accordion-header-active ui-state-active"),i.icons&&s.children(".ui-accordion-header-icon").removeClass(i.icons.activeHeader).addClass(i.icons.header),a||(n.removeClass("ui-corner-all").addClass("ui-accordion-header-active ui-state-active ui-corner-top"),i.icons&&n.children(".ui-accordion-header-icon").removeClass(i.icons.header).addClass(i.icons.activeHeader),n.next().addClass("ui-accordion-content-active")))},_toggle:function(t){var i=t.newPanel,s=this.prevShow.length?this.prevShow:t.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=i,this.prevHide=s,this.options.animate?this._animate(i,s,t):(s.hide(),i.show(),this._toggleComplete(t)),s.attr({"aria-hidden":"true"}),s.prev().attr({"aria-selected":"false","aria-expanded":"false"}),i.length&&s.length?s.prev().attr({tabIndex:-1,"aria-expanded":"false"}):i.length&&this.headers.filter(function(){return 0===parseInt(e(this).attr("tabIndex"),10)}).attr("tabIndex",-1),i.attr("aria-hidden","false").prev().attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_animate:function(e,t,i){var s,n,a,o=this,r=0,h=e.css("box-sizing"),l=e.length&&(!t.length||e.index()",delay:300,options:{icons:{submenu:"ui-icon-carat-1-e"},items:"> *",menus:"ul",position:{my:"left-1 top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().addClass("ui-menu ui-widget ui-widget-content").toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length).attr({role:this.options.role,tabIndex:0}),this.options.disabled&&this.element.addClass("ui-state-disabled").attr("aria-disabled","true"),this._on({"mousedown .ui-menu-item":function(e){e.preventDefault()},"click .ui-menu-item":function(t){var i=e(t.target);!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.select(t),t.isPropagationStopped()||(this.mouseHandled=!0),i.has(".ui-menu").length?this.expand(t):!this.element.is(":focus")&&e(this.document[0].activeElement).closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(t){if(!this.previousFilter){var i=e(t.currentTarget); -i.siblings(".ui-state-active").removeClass("ui-state-active"),this.focus(t,i)}},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(e,t){var i=this.active||this.element.find(this.options.items).eq(0);t||this.focus(e,i)},blur:function(t){this._delay(function(){e.contains(this.element[0],this.document[0].activeElement)||this.collapseAll(t)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(e){this._closeOnDocumentClick(e)&&this.collapseAll(e),this.mouseHandled=!1}})},_destroy:function(){this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeClass("ui-menu ui-widget ui-widget-content ui-menu-icons ui-front").removeAttr("role").removeAttr("tabIndex").removeAttr("aria-labelledby").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-disabled").removeUniqueId().show(),this.element.find(".ui-menu-item").removeClass("ui-menu-item").removeAttr("role").removeAttr("aria-disabled").removeUniqueId().removeClass("ui-state-hover").removeAttr("tabIndex").removeAttr("role").removeAttr("aria-haspopup").children().each(function(){var t=e(this);t.data("ui-menu-submenu-carat")&&t.remove()}),this.element.find(".ui-menu-divider").removeClass("ui-menu-divider ui-widget-content")},_keydown:function(t){var i,s,n,a,o=!0;switch(t.keyCode){case e.ui.keyCode.PAGE_UP:this.previousPage(t);break;case e.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case e.ui.keyCode.HOME:this._move("first","first",t);break;case e.ui.keyCode.END:this._move("last","last",t);break;case e.ui.keyCode.UP:this.previous(t);break;case e.ui.keyCode.DOWN:this.next(t);break;case e.ui.keyCode.LEFT:this.collapse(t);break;case e.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case e.ui.keyCode.ENTER:case e.ui.keyCode.SPACE:this._activate(t);break;case e.ui.keyCode.ESCAPE:this.collapse(t);break;default:o=!1,s=this.previousFilter||"",n=String.fromCharCode(t.keyCode),a=!1,clearTimeout(this.filterTimer),n===s?a=!0:n=s+n,i=this._filterMenuItems(n),i=a&&-1!==i.index(this.active.next())?this.active.nextAll(".ui-menu-item"):i,i.length||(n=String.fromCharCode(t.keyCode),i=this._filterMenuItems(n)),i.length?(this.focus(t,i),this.previousFilter=n,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}o&&t.preventDefault()},_activate:function(e){this.active.is(".ui-state-disabled")||(this.active.is("[aria-haspopup='true']")?this.expand(e):this.select(e))},refresh:function(){var t,i,s=this,n=this.options.icons.submenu,a=this.element.find(this.options.menus);this.element.toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length),a.filter(":not(.ui-menu)").addClass("ui-menu ui-widget ui-widget-content ui-front").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var t=e(this),i=t.parent(),s=e("").addClass("ui-menu-icon ui-icon "+n).data("ui-menu-submenu-carat",!0);i.attr("aria-haspopup","true").prepend(s),t.attr("aria-labelledby",i.attr("id"))}),t=a.add(this.element),i=t.find(this.options.items),i.not(".ui-menu-item").each(function(){var t=e(this);s._isDivider(t)&&t.addClass("ui-widget-content ui-menu-divider")}),i.not(".ui-menu-item, .ui-menu-divider").addClass("ui-menu-item").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),i.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!e.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(e,t){"icons"===e&&this.element.find(".ui-menu-icon").removeClass(this.options.icons.submenu).addClass(t.submenu),"disabled"===e&&this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this._super(e,t)},focus:function(e,t){var i,s;this.blur(e,e&&"focus"===e.type),this._scrollIntoView(t),this.active=t.first(),s=this.active.addClass("ui-state-focus").removeClass("ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),this.active.parent().closest(".ui-menu-item").addClass("ui-state-active"),e&&"keydown"===e.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=t.children(".ui-menu"),i.length&&e&&/^mouse/.test(e.type)&&this._startOpening(i),this.activeMenu=t.parent(),this._trigger("focus",e,{item:t})},_scrollIntoView:function(t){var i,s,n,a,o,r;this._hasScroll()&&(i=parseFloat(e.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(e.css(this.activeMenu[0],"paddingTop"))||0,n=t.offset().top-this.activeMenu.offset().top-i-s,a=this.activeMenu.scrollTop(),o=this.activeMenu.height(),r=t.outerHeight(),0>n?this.activeMenu.scrollTop(a+n):n+r>o&&this.activeMenu.scrollTop(a+n-o+r))},blur:function(e,t){t||clearTimeout(this.timer),this.active&&(this.active.removeClass("ui-state-focus"),this.active=null,this._trigger("blur",e,{item:this.active}))},_startOpening:function(e){clearTimeout(this.timer),"true"===e.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(e)},this.delay))},_open:function(t){var i=e.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(t.parents(".ui-menu")).hide().attr("aria-hidden","true"),t.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(t,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:e(t&&t.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(t),this.activeMenu=s},this.delay)},_close:function(e){e||(e=this.active?this.active.parent():this.element),e.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false").end().find(".ui-state-active").not(".ui-state-focus").removeClass("ui-state-active")},_closeOnDocumentClick:function(t){return!e(t.target).closest(".ui-menu").length},_isDivider:function(e){return!/[^\-\u2014\u2013\s]/.test(e.text())},collapse:function(e){var t=this.active&&this.active.parent().closest(".ui-menu-item",this.element);t&&t.length&&(this._close(),this.focus(e,t))},expand:function(e){var t=this.active&&this.active.children(".ui-menu ").find(this.options.items).first();t&&t.length&&(this._open(t.parent()),this._delay(function(){this.focus(e,t)}))},next:function(e){this._move("next","first",e)},previous:function(e){this._move("prev","last",e)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(e,t,i){var s;this.active&&(s="first"===e||"last"===e?this.active["first"===e?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[e+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.find(this.options.items)[t]()),this.focus(i,s)},nextPage:function(t){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=e(this),0>i.offset().top-s-n}),this.focus(t,i)):this.focus(t,this.activeMenu.find(this.options.items)[this.active?"last":"first"]())),void 0):(this.next(t),void 0)},previousPage:function(t){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=e(this),i.offset().top-s+n>0}),this.focus(t,i)):this.focus(t,this.activeMenu.find(this.options.items).first())),void 0):(this.next(t),void 0)},_hasScroll:function(){return this.element.outerHeight()",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,_create:function(){var t,i,s,n=this.element[0].nodeName.toLowerCase(),a="textarea"===n,o="input"===n;this.isMultiLine=a?!0:o?!1:this.element.prop("isContentEditable"),this.valueMethod=this.element[a||o?"val":"text"],this.isNewMenu=!0,this.element.addClass("ui-autocomplete-input").attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return t=!0,s=!0,i=!0,void 0;t=!1,s=!1,i=!1;var a=e.ui.keyCode;switch(n.keyCode){case a.PAGE_UP:t=!0,this._move("previousPage",n);break;case a.PAGE_DOWN:t=!0,this._move("nextPage",n);break;case a.UP:t=!0,this._keyEvent("previous",n);break;case a.DOWN:t=!0,this._keyEvent("next",n);break;case a.ENTER:this.menu.active&&(t=!0,n.preventDefault(),this.menu.select(n));break;case a.TAB:this.menu.active&&this.menu.select(n);break;case a.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(t)return t=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),void 0;if(!i){var n=e.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(e){return s?(s=!1,e.preventDefault(),void 0):(this._searchTimeout(e),void 0)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(e){return this.cancelBlur?(delete this.cancelBlur,void 0):(clearTimeout(this.searching),this.close(e),this._change(e),void 0)}}),this._initSource(),this.menu=e("
    ").addClass("ui-autocomplete ui-front").appendTo(this._appendTo()).menu({role:null}).hide().menu("instance"),this._on(this.menu.element,{mousedown:function(t){t.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur});var i=this.menu.element[0];e(t.target).closest(".ui-menu-item").length||this._delay(function(){var t=this;this.document.one("mousedown",function(s){s.target===t.element[0]||s.target===i||e.contains(i,s.target)||t.close()})})},menufocus:function(t,i){var s,n;return this.isNewMenu&&(this.isNewMenu=!1,t.originalEvent&&/^mouse/.test(t.originalEvent.type))?(this.menu.blur(),this.document.one("mousemove",function(){e(t.target).trigger(t.originalEvent)}),void 0):(n=i.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",t,{item:n})&&t.originalEvent&&/^key/.test(t.originalEvent.type)&&this._value(n.value),s=i.item.attr("aria-label")||n.value,s&&e.trim(s).length&&(this.liveRegion.children().hide(),e("
    ").text(s).appendTo(this.liveRegion)),void 0)},menuselect:function(e,t){var i=t.item.data("ui-autocomplete-item"),s=this.previous;this.element[0]!==this.document[0].activeElement&&(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s,this.selectedItem=i})),!1!==this._trigger("select",e,{item:i})&&this._value(i.value),this.term=this._value(),this.close(e),this.selectedItem=i}}),this.liveRegion=e("",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).addClass("ui-helper-hidden-accessible").appendTo(this.document[0].body),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(e,t){this._super(e,t),"source"===e&&this._initSource(),"appendTo"===e&&this.menu.element.appendTo(this._appendTo()),"disabled"===e&&t&&this.xhr&&this.xhr.abort()},_appendTo:function(){var t=this.options.appendTo;return t&&(t=t.jquery||t.nodeType?e(t):this.document.find(t).eq(0)),t&&t[0]||(t=this.element.closest(".ui-front")),t.length||(t=this.document[0].body),t},_initSource:function(){var t,i,s=this;e.isArray(this.options.source)?(t=this.options.source,this.source=function(i,s){s(e.ui.autocomplete.filter(t,i.term))}):"string"==typeof this.options.source?(i=this.options.source,this.source=function(t,n){s.xhr&&s.xhr.abort(),s.xhr=e.ajax({url:i,data:t,dataType:"json",success:function(e){n(e)},error:function(){n([])}})}):this.source=this.options.source},_searchTimeout:function(e){clearTimeout(this.searching),this.searching=this._delay(function(){var t=this.term===this._value(),i=this.menu.element.is(":visible"),s=e.altKey||e.ctrlKey||e.metaKey||e.shiftKey;(!t||t&&!i&&!s)&&(this.selectedItem=null,this.search(null,e))},this.options.delay)},search:function(e,t){return e=null!=e?e:this._value(),this.term=this._value(),e.length").text(i.label).appendTo(t)},_move:function(e,t){return this.menu.element.is(":visible")?this.menu.isFirstItem()&&/^previous/.test(e)||this.menu.isLastItem()&&/^next/.test(e)?(this.isMultiLine||this._value(this.term),this.menu.blur(),void 0):(this.menu[e](t),void 0):(this.search(null,t),void 0)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(e,t){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(e,t),t.preventDefault())}}),e.extend(e.ui.autocomplete,{escapeRegex:function(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(t,i){var s=RegExp(e.ui.autocomplete.escapeRegex(i),"i");return e.grep(t,function(e){return s.test(e.label||e.value||e)})}}),e.widget("ui.autocomplete",e.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(e){return e+(e>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(t){var i;this._superApply(arguments),this.options.disabled||this.cancelSearch||(i=t&&t.length?this.options.messages.results(t.length):this.options.messages.noResults,this.liveRegion.children().hide(),e("
    ").text(i).appendTo(this.liveRegion))}}),e.ui.autocomplete;var c,p="ui-button ui-widget ui-state-default ui-corner-all",f="ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",m=function(){var t=e(this);setTimeout(function(){t.find(":ui-button").button("refresh")},1)},g=function(t){var i=t.name,s=t.form,n=e([]);return i&&(i=i.replace(/'/g,"\\'"),n=s?e(s).find("[name='"+i+"'][type=radio]"):e("[name='"+i+"'][type=radio]",t.ownerDocument).filter(function(){return!this.form})),n};e.widget("ui.button",{version:"1.11.4",defaultElement:"").addClass(this._triggerClass).html(a?e("").attr({src:a,alt:n,title:n}):n)),t[r?"before":"after"](i.trigger),i.trigger.click(function(){return e.datepicker._datepickerShowing&&e.datepicker._lastInput===t[0]?e.datepicker._hideDatepicker():e.datepicker._datepickerShowing&&e.datepicker._lastInput!==t[0]?(e.datepicker._hideDatepicker(),e.datepicker._showDatepicker(t[0])):e.datepicker._showDatepicker(t[0]),!1}))},_autoSize:function(e){if(this._get(e,"autoSize")&&!e.inline){var t,i,s,n,a=new Date(2009,11,20),o=this._get(e,"dateFormat");o.match(/[DM]/)&&(t=function(e){for(i=0,s=0,n=0;e.length>n;n++)e[n].length>i&&(i=e[n].length,s=n);return s},a.setMonth(t(this._get(e,o.match(/MM/)?"monthNames":"monthNamesShort"))),a.setDate(t(this._get(e,o.match(/DD/)?"dayNames":"dayNamesShort"))+20-a.getDay())),e.input.attr("size",this._formatDate(e,a).length)}},_inlineDatepicker:function(t,i){var s=e(t);s.hasClass(this.markerClassName)||(s.addClass(this.markerClassName).append(i.dpDiv),e.data(t,"datepicker",i),this._setDate(i,this._getDefaultDate(i),!0),this._updateDatepicker(i),this._updateAlternate(i),i.settings.disabled&&this._disableDatepicker(t),i.dpDiv.css("display","block"))},_dialogDatepicker:function(t,i,s,n,a){var o,h,l,u,d,c=this._dialogInst;return c||(this.uuid+=1,o="dp"+this.uuid,this._dialogInput=e(""),this._dialogInput.keydown(this._doKeyDown),e("body").append(this._dialogInput),c=this._dialogInst=this._newInst(this._dialogInput,!1),c.settings={},e.data(this._dialogInput[0],"datepicker",c)),r(c.settings,n||{}),i=i&&i.constructor===Date?this._formatDate(c,i):i,this._dialogInput.val(i),this._pos=a?a.length?a:[a.pageX,a.pageY]:null,this._pos||(h=document.documentElement.clientWidth,l=document.documentElement.clientHeight,u=document.documentElement.scrollLeft||document.body.scrollLeft,d=document.documentElement.scrollTop||document.body.scrollTop,this._pos=[h/2-100+u,l/2-150+d]),this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),c.settings.onSelect=s,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),e.blockUI&&e.blockUI(this.dpDiv),e.data(this._dialogInput[0],"datepicker",c),this},_destroyDatepicker:function(t){var i,s=e(t),n=e.data(t,"datepicker");s.hasClass(this.markerClassName)&&(i=t.nodeName.toLowerCase(),e.removeData(t,"datepicker"),"input"===i?(n.append.remove(),n.trigger.remove(),s.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)):("div"===i||"span"===i)&&s.removeClass(this.markerClassName).empty(),v===n&&(v=null))},_enableDatepicker:function(t){var i,s,n=e(t),a=e.data(t,"datepicker");n.hasClass(this.markerClassName)&&(i=t.nodeName.toLowerCase(),"input"===i?(t.disabled=!1,a.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().removeClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1)),this._disabledInputs=e.map(this._disabledInputs,function(e){return e===t?null:e}))},_disableDatepicker:function(t){var i,s,n=e(t),a=e.data(t,"datepicker");n.hasClass(this.markerClassName)&&(i=t.nodeName.toLowerCase(),"input"===i?(t.disabled=!0,a.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().addClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0)),this._disabledInputs=e.map(this._disabledInputs,function(e){return e===t?null:e}),this._disabledInputs[this._disabledInputs.length]=t)},_isDisabledDatepicker:function(e){if(!e)return!1;for(var t=0;this._disabledInputs.length>t;t++)if(this._disabledInputs[t]===e)return!0;return!1},_getInst:function(t){try{return e.data(t,"datepicker")}catch(i){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(t,i,s){var n,a,o,h,l=this._getInst(t);return 2===arguments.length&&"string"==typeof i?"defaults"===i?e.extend({},e.datepicker._defaults):l?"all"===i?e.extend({},l.settings):this._get(l,i):null:(n=i||{},"string"==typeof i&&(n={},n[i]=s),l&&(this._curInst===l&&this._hideDatepicker(),a=this._getDateDatepicker(t,!0),o=this._getMinMaxDate(l,"min"),h=this._getMinMaxDate(l,"max"),r(l.settings,n),null!==o&&void 0!==n.dateFormat&&void 0===n.minDate&&(l.settings.minDate=this._formatDate(l,o)),null!==h&&void 0!==n.dateFormat&&void 0===n.maxDate&&(l.settings.maxDate=this._formatDate(l,h)),"disabled"in n&&(n.disabled?this._disableDatepicker(t):this._enableDatepicker(t)),this._attachments(e(t),l),this._autoSize(l),this._setDate(l,a),this._updateAlternate(l),this._updateDatepicker(l)),void 0)},_changeDatepicker:function(e,t,i){this._optionDatepicker(e,t,i)},_refreshDatepicker:function(e){var t=this._getInst(e);t&&this._updateDatepicker(t)},_setDateDatepicker:function(e,t){var i=this._getInst(e);i&&(this._setDate(i,t),this._updateDatepicker(i),this._updateAlternate(i))},_getDateDatepicker:function(e,t){var i=this._getInst(e);return i&&!i.inline&&this._setDateFromField(i,t),i?this._getDate(i):null},_doKeyDown:function(t){var i,s,n,a=e.datepicker._getInst(t.target),o=!0,r=a.dpDiv.is(".ui-datepicker-rtl");if(a._keyEvent=!0,e.datepicker._datepickerShowing)switch(t.keyCode){case 9:e.datepicker._hideDatepicker(),o=!1;break;case 13:return n=e("td."+e.datepicker._dayOverClass+":not(."+e.datepicker._currentClass+")",a.dpDiv),n[0]&&e.datepicker._selectDay(t.target,a.selectedMonth,a.selectedYear,n[0]),i=e.datepicker._get(a,"onSelect"),i?(s=e.datepicker._formatDate(a),i.apply(a.input?a.input[0]:null,[s,a])):e.datepicker._hideDatepicker(),!1;case 27:e.datepicker._hideDatepicker();break;case 33:e.datepicker._adjustDate(t.target,t.ctrlKey?-e.datepicker._get(a,"stepBigMonths"):-e.datepicker._get(a,"stepMonths"),"M");break;case 34:e.datepicker._adjustDate(t.target,t.ctrlKey?+e.datepicker._get(a,"stepBigMonths"):+e.datepicker._get(a,"stepMonths"),"M");break;case 35:(t.ctrlKey||t.metaKey)&&e.datepicker._clearDate(t.target),o=t.ctrlKey||t.metaKey;break;case 36:(t.ctrlKey||t.metaKey)&&e.datepicker._gotoToday(t.target),o=t.ctrlKey||t.metaKey;break;case 37:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,r?1:-1,"D"),o=t.ctrlKey||t.metaKey,t.originalEvent.altKey&&e.datepicker._adjustDate(t.target,t.ctrlKey?-e.datepicker._get(a,"stepBigMonths"):-e.datepicker._get(a,"stepMonths"),"M");break;case 38:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,-7,"D"),o=t.ctrlKey||t.metaKey;break;case 39:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,r?-1:1,"D"),o=t.ctrlKey||t.metaKey,t.originalEvent.altKey&&e.datepicker._adjustDate(t.target,t.ctrlKey?+e.datepicker._get(a,"stepBigMonths"):+e.datepicker._get(a,"stepMonths"),"M");break;case 40:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,7,"D"),o=t.ctrlKey||t.metaKey;break;default:o=!1}else 36===t.keyCode&&t.ctrlKey?e.datepicker._showDatepicker(this):o=!1;o&&(t.preventDefault(),t.stopPropagation())},_doKeyPress:function(t){var i,s,n=e.datepicker._getInst(t.target); -return e.datepicker._get(n,"constrainInput")?(i=e.datepicker._possibleChars(e.datepicker._get(n,"dateFormat")),s=String.fromCharCode(null==t.charCode?t.keyCode:t.charCode),t.ctrlKey||t.metaKey||" ">s||!i||i.indexOf(s)>-1):void 0},_doKeyUp:function(t){var i,s=e.datepicker._getInst(t.target);if(s.input.val()!==s.lastVal)try{i=e.datepicker.parseDate(e.datepicker._get(s,"dateFormat"),s.input?s.input.val():null,e.datepicker._getFormatConfig(s)),i&&(e.datepicker._setDateFromField(s),e.datepicker._updateAlternate(s),e.datepicker._updateDatepicker(s))}catch(n){}return!0},_showDatepicker:function(t){if(t=t.target||t,"input"!==t.nodeName.toLowerCase()&&(t=e("input",t.parentNode)[0]),!e.datepicker._isDisabledDatepicker(t)&&e.datepicker._lastInput!==t){var i,n,a,o,h,l,u;i=e.datepicker._getInst(t),e.datepicker._curInst&&e.datepicker._curInst!==i&&(e.datepicker._curInst.dpDiv.stop(!0,!0),i&&e.datepicker._datepickerShowing&&e.datepicker._hideDatepicker(e.datepicker._curInst.input[0])),n=e.datepicker._get(i,"beforeShow"),a=n?n.apply(t,[t,i]):{},a!==!1&&(r(i.settings,a),i.lastVal=null,e.datepicker._lastInput=t,e.datepicker._setDateFromField(i),e.datepicker._inDialog&&(t.value=""),e.datepicker._pos||(e.datepicker._pos=e.datepicker._findPos(t),e.datepicker._pos[1]+=t.offsetHeight),o=!1,e(t).parents().each(function(){return o|="fixed"===e(this).css("position"),!o}),h={left:e.datepicker._pos[0],top:e.datepicker._pos[1]},e.datepicker._pos=null,i.dpDiv.empty(),i.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),e.datepicker._updateDatepicker(i),h=e.datepicker._checkOffset(i,h,o),i.dpDiv.css({position:e.datepicker._inDialog&&e.blockUI?"static":o?"fixed":"absolute",display:"none",left:h.left+"px",top:h.top+"px"}),i.inline||(l=e.datepicker._get(i,"showAnim"),u=e.datepicker._get(i,"duration"),i.dpDiv.css("z-index",s(e(t))+1),e.datepicker._datepickerShowing=!0,e.effects&&e.effects.effect[l]?i.dpDiv.show(l,e.datepicker._get(i,"showOptions"),u):i.dpDiv[l||"show"](l?u:null),e.datepicker._shouldFocusInput(i)&&i.input.focus(),e.datepicker._curInst=i))}},_updateDatepicker:function(t){this.maxRows=4,v=t,t.dpDiv.empty().append(this._generateHTML(t)),this._attachHandlers(t);var i,s=this._getNumberOfMonths(t),n=s[1],a=17,r=t.dpDiv.find("."+this._dayOverClass+" a");r.length>0&&o.apply(r.get(0)),t.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),n>1&&t.dpDiv.addClass("ui-datepicker-multi-"+n).css("width",a*n+"em"),t.dpDiv[(1!==s[0]||1!==s[1]?"add":"remove")+"Class"]("ui-datepicker-multi"),t.dpDiv[(this._get(t,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),t===e.datepicker._curInst&&e.datepicker._datepickerShowing&&e.datepicker._shouldFocusInput(t)&&t.input.focus(),t.yearshtml&&(i=t.yearshtml,setTimeout(function(){i===t.yearshtml&&t.yearshtml&&t.dpDiv.find("select.ui-datepicker-year:first").replaceWith(t.yearshtml),i=t.yearshtml=null},0))},_shouldFocusInput:function(e){return e.input&&e.input.is(":visible")&&!e.input.is(":disabled")&&!e.input.is(":focus")},_checkOffset:function(t,i,s){var n=t.dpDiv.outerWidth(),a=t.dpDiv.outerHeight(),o=t.input?t.input.outerWidth():0,r=t.input?t.input.outerHeight():0,h=document.documentElement.clientWidth+(s?0:e(document).scrollLeft()),l=document.documentElement.clientHeight+(s?0:e(document).scrollTop());return i.left-=this._get(t,"isRTL")?n-o:0,i.left-=s&&i.left===t.input.offset().left?e(document).scrollLeft():0,i.top-=s&&i.top===t.input.offset().top+r?e(document).scrollTop():0,i.left-=Math.min(i.left,i.left+n>h&&h>n?Math.abs(i.left+n-h):0),i.top-=Math.min(i.top,i.top+a>l&&l>a?Math.abs(a+r):0),i},_findPos:function(t){for(var i,s=this._getInst(t),n=this._get(s,"isRTL");t&&("hidden"===t.type||1!==t.nodeType||e.expr.filters.hidden(t));)t=t[n?"previousSibling":"nextSibling"];return i=e(t).offset(),[i.left,i.top]},_hideDatepicker:function(t){var i,s,n,a,o=this._curInst;!o||t&&o!==e.data(t,"datepicker")||this._datepickerShowing&&(i=this._get(o,"showAnim"),s=this._get(o,"duration"),n=function(){e.datepicker._tidyDialog(o)},e.effects&&(e.effects.effect[i]||e.effects[i])?o.dpDiv.hide(i,e.datepicker._get(o,"showOptions"),s,n):o.dpDiv["slideDown"===i?"slideUp":"fadeIn"===i?"fadeOut":"hide"](i?s:null,n),i||n(),this._datepickerShowing=!1,a=this._get(o,"onClose"),a&&a.apply(o.input?o.input[0]:null,[o.input?o.input.val():"",o]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),e.blockUI&&(e.unblockUI(),e("body").append(this.dpDiv))),this._inDialog=!1)},_tidyDialog:function(e){e.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(t){if(e.datepicker._curInst){var i=e(t.target),s=e.datepicker._getInst(i[0]);(i[0].id!==e.datepicker._mainDivId&&0===i.parents("#"+e.datepicker._mainDivId).length&&!i.hasClass(e.datepicker.markerClassName)&&!i.closest("."+e.datepicker._triggerClass).length&&e.datepicker._datepickerShowing&&(!e.datepicker._inDialog||!e.blockUI)||i.hasClass(e.datepicker.markerClassName)&&e.datepicker._curInst!==s)&&e.datepicker._hideDatepicker()}},_adjustDate:function(t,i,s){var n=e(t),a=this._getInst(n[0]);this._isDisabledDatepicker(n[0])||(this._adjustInstDate(a,i+("M"===s?this._get(a,"showCurrentAtPos"):0),s),this._updateDatepicker(a))},_gotoToday:function(t){var i,s=e(t),n=this._getInst(s[0]);this._get(n,"gotoCurrent")&&n.currentDay?(n.selectedDay=n.currentDay,n.drawMonth=n.selectedMonth=n.currentMonth,n.drawYear=n.selectedYear=n.currentYear):(i=new Date,n.selectedDay=i.getDate(),n.drawMonth=n.selectedMonth=i.getMonth(),n.drawYear=n.selectedYear=i.getFullYear()),this._notifyChange(n),this._adjustDate(s)},_selectMonthYear:function(t,i,s){var n=e(t),a=this._getInst(n[0]);a["selected"+("M"===s?"Month":"Year")]=a["draw"+("M"===s?"Month":"Year")]=parseInt(i.options[i.selectedIndex].value,10),this._notifyChange(a),this._adjustDate(n)},_selectDay:function(t,i,s,n){var a,o=e(t);e(n).hasClass(this._unselectableClass)||this._isDisabledDatepicker(o[0])||(a=this._getInst(o[0]),a.selectedDay=a.currentDay=e("a",n).html(),a.selectedMonth=a.currentMonth=i,a.selectedYear=a.currentYear=s,this._selectDate(t,this._formatDate(a,a.currentDay,a.currentMonth,a.currentYear)))},_clearDate:function(t){var i=e(t);this._selectDate(i,"")},_selectDate:function(t,i){var s,n=e(t),a=this._getInst(n[0]);i=null!=i?i:this._formatDate(a),a.input&&a.input.val(i),this._updateAlternate(a),s=this._get(a,"onSelect"),s?s.apply(a.input?a.input[0]:null,[i,a]):a.input&&a.input.trigger("change"),a.inline?this._updateDatepicker(a):(this._hideDatepicker(),this._lastInput=a.input[0],"object"!=typeof a.input[0]&&a.input.focus(),this._lastInput=null)},_updateAlternate:function(t){var i,s,n,a=this._get(t,"altField");a&&(i=this._get(t,"altFormat")||this._get(t,"dateFormat"),s=this._getDate(t),n=this.formatDate(i,s,this._getFormatConfig(t)),e(a).each(function(){e(this).val(n)}))},noWeekends:function(e){var t=e.getDay();return[t>0&&6>t,""]},iso8601Week:function(e){var t,i=new Date(e.getTime());return i.setDate(i.getDate()+4-(i.getDay()||7)),t=i.getTime(),i.setMonth(0),i.setDate(1),Math.floor(Math.round((t-i)/864e5)/7)+1},parseDate:function(t,i,s){if(null==t||null==i)throw"Invalid arguments";if(i="object"==typeof i?""+i:i+"",""===i)return null;var n,a,o,r,h=0,l=(s?s.shortYearCutoff:null)||this._defaults.shortYearCutoff,u="string"!=typeof l?l:(new Date).getFullYear()%100+parseInt(l,10),d=(s?s.dayNamesShort:null)||this._defaults.dayNamesShort,c=(s?s.dayNames:null)||this._defaults.dayNames,p=(s?s.monthNamesShort:null)||this._defaults.monthNamesShort,f=(s?s.monthNames:null)||this._defaults.monthNames,m=-1,g=-1,v=-1,y=-1,b=!1,_=function(e){var i=t.length>n+1&&t.charAt(n+1)===e;return i&&n++,i},x=function(e){var t=_(e),s="@"===e?14:"!"===e?20:"y"===e&&t?4:"o"===e?3:2,n="y"===e?s:1,a=RegExp("^\\d{"+n+","+s+"}"),o=i.substring(h).match(a);if(!o)throw"Missing number at position "+h;return h+=o[0].length,parseInt(o[0],10)},w=function(t,s,n){var a=-1,o=e.map(_(t)?n:s,function(e,t){return[[t,e]]}).sort(function(e,t){return-(e[1].length-t[1].length)});if(e.each(o,function(e,t){var s=t[1];return i.substr(h,s.length).toLowerCase()===s.toLowerCase()?(a=t[0],h+=s.length,!1):void 0}),-1!==a)return a+1;throw"Unknown name at position "+h},k=function(){if(i.charAt(h)!==t.charAt(n))throw"Unexpected literal at position "+h;h++};for(n=0;t.length>n;n++)if(b)"'"!==t.charAt(n)||_("'")?k():b=!1;else switch(t.charAt(n)){case"d":v=x("d");break;case"D":w("D",d,c);break;case"o":y=x("o");break;case"m":g=x("m");break;case"M":g=w("M",p,f);break;case"y":m=x("y");break;case"@":r=new Date(x("@")),m=r.getFullYear(),g=r.getMonth()+1,v=r.getDate();break;case"!":r=new Date((x("!")-this._ticksTo1970)/1e4),m=r.getFullYear(),g=r.getMonth()+1,v=r.getDate();break;case"'":_("'")?k():b=!0;break;default:k()}if(i.length>h&&(o=i.substr(h),!/^\s+/.test(o)))throw"Extra/unparsed characters found in date: "+o;if(-1===m?m=(new Date).getFullYear():100>m&&(m+=(new Date).getFullYear()-(new Date).getFullYear()%100+(u>=m?0:-100)),y>-1)for(g=1,v=y;;){if(a=this._getDaysInMonth(m,g-1),a>=v)break;g++,v-=a}if(r=this._daylightSavingAdjust(new Date(m,g-1,v)),r.getFullYear()!==m||r.getMonth()+1!==g||r.getDate()!==v)throw"Invalid date";return r},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:1e7*60*60*24*(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925)),formatDate:function(e,t,i){if(!t)return"";var s,n=(i?i.dayNamesShort:null)||this._defaults.dayNamesShort,a=(i?i.dayNames:null)||this._defaults.dayNames,o=(i?i.monthNamesShort:null)||this._defaults.monthNamesShort,r=(i?i.monthNames:null)||this._defaults.monthNames,h=function(t){var i=e.length>s+1&&e.charAt(s+1)===t;return i&&s++,i},l=function(e,t,i){var s=""+t;if(h(e))for(;i>s.length;)s="0"+s;return s},u=function(e,t,i,s){return h(e)?s[t]:i[t]},d="",c=!1;if(t)for(s=0;e.length>s;s++)if(c)"'"!==e.charAt(s)||h("'")?d+=e.charAt(s):c=!1;else switch(e.charAt(s)){case"d":d+=l("d",t.getDate(),2);break;case"D":d+=u("D",t.getDay(),n,a);break;case"o":d+=l("o",Math.round((new Date(t.getFullYear(),t.getMonth(),t.getDate()).getTime()-new Date(t.getFullYear(),0,0).getTime())/864e5),3);break;case"m":d+=l("m",t.getMonth()+1,2);break;case"M":d+=u("M",t.getMonth(),o,r);break;case"y":d+=h("y")?t.getFullYear():(10>t.getYear()%100?"0":"")+t.getYear()%100;break;case"@":d+=t.getTime();break;case"!":d+=1e4*t.getTime()+this._ticksTo1970;break;case"'":h("'")?d+="'":c=!0;break;default:d+=e.charAt(s)}return d},_possibleChars:function(e){var t,i="",s=!1,n=function(i){var s=e.length>t+1&&e.charAt(t+1)===i;return s&&t++,s};for(t=0;e.length>t;t++)if(s)"'"!==e.charAt(t)||n("'")?i+=e.charAt(t):s=!1;else switch(e.charAt(t)){case"d":case"m":case"y":case"@":i+="0123456789";break;case"D":case"M":return null;case"'":n("'")?i+="'":s=!0;break;default:i+=e.charAt(t)}return i},_get:function(e,t){return void 0!==e.settings[t]?e.settings[t]:this._defaults[t]},_setDateFromField:function(e,t){if(e.input.val()!==e.lastVal){var i=this._get(e,"dateFormat"),s=e.lastVal=e.input?e.input.val():null,n=this._getDefaultDate(e),a=n,o=this._getFormatConfig(e);try{a=this.parseDate(i,s,o)||n}catch(r){s=t?"":s}e.selectedDay=a.getDate(),e.drawMonth=e.selectedMonth=a.getMonth(),e.drawYear=e.selectedYear=a.getFullYear(),e.currentDay=s?a.getDate():0,e.currentMonth=s?a.getMonth():0,e.currentYear=s?a.getFullYear():0,this._adjustInstDate(e)}},_getDefaultDate:function(e){return this._restrictMinMax(e,this._determineDate(e,this._get(e,"defaultDate"),new Date))},_determineDate:function(t,i,s){var n=function(e){var t=new Date;return t.setDate(t.getDate()+e),t},a=function(i){try{return e.datepicker.parseDate(e.datepicker._get(t,"dateFormat"),i,e.datepicker._getFormatConfig(t))}catch(s){}for(var n=(i.toLowerCase().match(/^c/)?e.datepicker._getDate(t):null)||new Date,a=n.getFullYear(),o=n.getMonth(),r=n.getDate(),h=/([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,l=h.exec(i);l;){switch(l[2]||"d"){case"d":case"D":r+=parseInt(l[1],10);break;case"w":case"W":r+=7*parseInt(l[1],10);break;case"m":case"M":o+=parseInt(l[1],10),r=Math.min(r,e.datepicker._getDaysInMonth(a,o));break;case"y":case"Y":a+=parseInt(l[1],10),r=Math.min(r,e.datepicker._getDaysInMonth(a,o))}l=h.exec(i)}return new Date(a,o,r)},o=null==i||""===i?s:"string"==typeof i?a(i):"number"==typeof i?isNaN(i)?s:n(i):new Date(i.getTime());return o=o&&"Invalid Date"==""+o?s:o,o&&(o.setHours(0),o.setMinutes(0),o.setSeconds(0),o.setMilliseconds(0)),this._daylightSavingAdjust(o)},_daylightSavingAdjust:function(e){return e?(e.setHours(e.getHours()>12?e.getHours()+2:0),e):null},_setDate:function(e,t,i){var s=!t,n=e.selectedMonth,a=e.selectedYear,o=this._restrictMinMax(e,this._determineDate(e,t,new Date));e.selectedDay=e.currentDay=o.getDate(),e.drawMonth=e.selectedMonth=e.currentMonth=o.getMonth(),e.drawYear=e.selectedYear=e.currentYear=o.getFullYear(),n===e.selectedMonth&&a===e.selectedYear||i||this._notifyChange(e),this._adjustInstDate(e),e.input&&e.input.val(s?"":this._formatDate(e))},_getDate:function(e){var t=!e.currentYear||e.input&&""===e.input.val()?null:this._daylightSavingAdjust(new Date(e.currentYear,e.currentMonth,e.currentDay));return t},_attachHandlers:function(t){var i=this._get(t,"stepMonths"),s="#"+t.id.replace(/\\\\/g,"\\");t.dpDiv.find("[data-handler]").map(function(){var t={prev:function(){e.datepicker._adjustDate(s,-i,"M")},next:function(){e.datepicker._adjustDate(s,+i,"M")},hide:function(){e.datepicker._hideDatepicker()},today:function(){e.datepicker._gotoToday(s)},selectDay:function(){return e.datepicker._selectDay(s,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return e.datepicker._selectMonthYear(s,this,"M"),!1},selectYear:function(){return e.datepicker._selectMonthYear(s,this,"Y"),!1}};e(this).bind(this.getAttribute("data-event"),t[this.getAttribute("data-handler")])})},_generateHTML:function(e){var t,i,s,n,a,o,r,h,l,u,d,c,p,f,m,g,v,y,b,_,x,w,k,T,D,S,M,C,N,A,P,I,H,z,F,E,O,j,W,L=new Date,R=this._daylightSavingAdjust(new Date(L.getFullYear(),L.getMonth(),L.getDate())),Y=this._get(e,"isRTL"),B=this._get(e,"showButtonPanel"),J=this._get(e,"hideIfNoPrevNext"),q=this._get(e,"navigationAsDateFormat"),K=this._getNumberOfMonths(e),V=this._get(e,"showCurrentAtPos"),U=this._get(e,"stepMonths"),Q=1!==K[0]||1!==K[1],G=this._daylightSavingAdjust(e.currentDay?new Date(e.currentYear,e.currentMonth,e.currentDay):new Date(9999,9,9)),X=this._getMinMaxDate(e,"min"),$=this._getMinMaxDate(e,"max"),Z=e.drawMonth-V,et=e.drawYear;if(0>Z&&(Z+=12,et--),$)for(t=this._daylightSavingAdjust(new Date($.getFullYear(),$.getMonth()-K[0]*K[1]+1,$.getDate())),t=X&&X>t?X:t;this._daylightSavingAdjust(new Date(et,Z,1))>t;)Z--,0>Z&&(Z=11,et--);for(e.drawMonth=Z,e.drawYear=et,i=this._get(e,"prevText"),i=q?this.formatDate(i,this._daylightSavingAdjust(new Date(et,Z-U,1)),this._getFormatConfig(e)):i,s=this._canAdjustMonth(e,-1,et,Z)?""+i+"":J?"":""+i+"",n=this._get(e,"nextText"),n=q?this.formatDate(n,this._daylightSavingAdjust(new Date(et,Z+U,1)),this._getFormatConfig(e)):n,a=this._canAdjustMonth(e,1,et,Z)?""+n+"":J?"":""+n+"",o=this._get(e,"currentText"),r=this._get(e,"gotoCurrent")&&e.currentDay?G:R,o=q?this.formatDate(o,r,this._getFormatConfig(e)):o,h=e.inline?"":"",l=B?"
    "+(Y?h:"")+(this._isInRange(e,r)?"":"")+(Y?"":h)+"
    ":"",u=parseInt(this._get(e,"firstDay"),10),u=isNaN(u)?0:u,d=this._get(e,"showWeek"),c=this._get(e,"dayNames"),p=this._get(e,"dayNamesMin"),f=this._get(e,"monthNames"),m=this._get(e,"monthNamesShort"),g=this._get(e,"beforeShowDay"),v=this._get(e,"showOtherMonths"),y=this._get(e,"selectOtherMonths"),b=this._getDefaultDate(e),_="",w=0;K[0]>w;w++){for(k="",this.maxRows=4,T=0;K[1]>T;T++){if(D=this._daylightSavingAdjust(new Date(et,Z,e.selectedDay)),S=" ui-corner-all",M="",Q){if(M+="
    "}for(M+="
    "+(/all|left/.test(S)&&0===w?Y?a:s:"")+(/all|right/.test(S)&&0===w?Y?s:a:"")+this._generateMonthYearHeader(e,Z,et,X,$,w>0||T>0,f,m)+"
    "+"",C=d?"":"",x=0;7>x;x++)N=(x+u)%7,C+="";for(M+=C+"",A=this._getDaysInMonth(et,Z),et===e.selectedYear&&Z===e.selectedMonth&&(e.selectedDay=Math.min(e.selectedDay,A)),P=(this._getFirstDayOfMonth(et,Z)-u+7)%7,I=Math.ceil((P+A)/7),H=Q?this.maxRows>I?this.maxRows:I:I,this.maxRows=H,z=this._daylightSavingAdjust(new Date(et,Z,1-P)),F=0;H>F;F++){for(M+="",E=d?"":"",x=0;7>x;x++)O=g?g.apply(e.input?e.input[0]:null,[z]):[!0,""],j=z.getMonth()!==Z,W=j&&!y||!O[0]||X&&X>z||$&&z>$,E+="",z.setDate(z.getDate()+1),z=this._daylightSavingAdjust(z);M+=E+""}Z++,Z>11&&(Z=0,et++),M+="
    "+this._get(e,"weekHeader")+"=5?" class='ui-datepicker-week-end'":"")+">"+""+p[N]+"
    "+this._get(e,"calculateWeek")(z)+""+(j&&!v?" ":W?""+z.getDate()+"":""+z.getDate()+"")+"
    "+(Q?"
    "+(K[0]>0&&T===K[1]-1?"
    ":""):""),k+=M}_+=k}return _+=l,e._keyEvent=!1,_},_generateMonthYearHeader:function(e,t,i,s,n,a,o,r){var h,l,u,d,c,p,f,m,g=this._get(e,"changeMonth"),v=this._get(e,"changeYear"),y=this._get(e,"showMonthAfterYear"),b="
    ",_="";if(a||!g)_+=""+o[t]+"";else{for(h=s&&s.getFullYear()===i,l=n&&n.getFullYear()===i,_+=""}if(y||(b+=_+(!a&&g&&v?"":" ")),!e.yearshtml)if(e.yearshtml="",a||!v)b+=""+i+"";else{for(d=this._get(e,"yearRange").split(":"),c=(new Date).getFullYear(),p=function(e){var t=e.match(/c[+\-].*/)?i+parseInt(e.substring(1),10):e.match(/[+\-].*/)?c+parseInt(e,10):parseInt(e,10);return isNaN(t)?c:t},f=p(d[0]),m=Math.max(f,p(d[1]||"")),f=s?Math.max(f,s.getFullYear()):f,m=n?Math.min(m,n.getFullYear()):m,e.yearshtml+="",b+=e.yearshtml,e.yearshtml=null}return b+=this._get(e,"yearSuffix"),y&&(b+=(!a&&g&&v?"":" ")+_),b+="
    "},_adjustInstDate:function(e,t,i){var s=e.drawYear+("Y"===i?t:0),n=e.drawMonth+("M"===i?t:0),a=Math.min(e.selectedDay,this._getDaysInMonth(s,n))+("D"===i?t:0),o=this._restrictMinMax(e,this._daylightSavingAdjust(new Date(s,n,a)));e.selectedDay=o.getDate(),e.drawMonth=e.selectedMonth=o.getMonth(),e.drawYear=e.selectedYear=o.getFullYear(),("M"===i||"Y"===i)&&this._notifyChange(e)},_restrictMinMax:function(e,t){var i=this._getMinMaxDate(e,"min"),s=this._getMinMaxDate(e,"max"),n=i&&i>t?i:t;return s&&n>s?s:n},_notifyChange:function(e){var t=this._get(e,"onChangeMonthYear");t&&t.apply(e.input?e.input[0]:null,[e.selectedYear,e.selectedMonth+1,e])},_getNumberOfMonths:function(e){var t=this._get(e,"numberOfMonths");return null==t?[1,1]:"number"==typeof t?[1,t]:t},_getMinMaxDate:function(e,t){return this._determineDate(e,this._get(e,t+"Date"),null)},_getDaysInMonth:function(e,t){return 32-this._daylightSavingAdjust(new Date(e,t,32)).getDate()},_getFirstDayOfMonth:function(e,t){return new Date(e,t,1).getDay()},_canAdjustMonth:function(e,t,i,s){var n=this._getNumberOfMonths(e),a=this._daylightSavingAdjust(new Date(i,s+(0>t?t:n[0]*n[1]),1));return 0>t&&a.setDate(this._getDaysInMonth(a.getFullYear(),a.getMonth())),this._isInRange(e,a)},_isInRange:function(e,t){var i,s,n=this._getMinMaxDate(e,"min"),a=this._getMinMaxDate(e,"max"),o=null,r=null,h=this._get(e,"yearRange");return h&&(i=h.split(":"),s=(new Date).getFullYear(),o=parseInt(i[0],10),r=parseInt(i[1],10),i[0].match(/[+\-].*/)&&(o+=s),i[1].match(/[+\-].*/)&&(r+=s)),(!n||t.getTime()>=n.getTime())&&(!a||t.getTime()<=a.getTime())&&(!o||t.getFullYear()>=o)&&(!r||r>=t.getFullYear())},_getFormatConfig:function(e){var t=this._get(e,"shortYearCutoff");return t="string"!=typeof t?t:(new Date).getFullYear()%100+parseInt(t,10),{shortYearCutoff:t,dayNamesShort:this._get(e,"dayNamesShort"),dayNames:this._get(e,"dayNames"),monthNamesShort:this._get(e,"monthNamesShort"),monthNames:this._get(e,"monthNames")}},_formatDate:function(e,t,i,s){t||(e.currentDay=e.selectedDay,e.currentMonth=e.selectedMonth,e.currentYear=e.selectedYear);var n=t?"object"==typeof t?t:this._daylightSavingAdjust(new Date(s,i,t)):this._daylightSavingAdjust(new Date(e.currentYear,e.currentMonth,e.currentDay));return this.formatDate(this._get(e,"dateFormat"),n,this._getFormatConfig(e))}}),e.fn.datepicker=function(t){if(!this.length)return this;e.datepicker.initialized||(e(document).mousedown(e.datepicker._checkExternalClick),e.datepicker.initialized=!0),0===e("#"+e.datepicker._mainDivId).length&&e("body").append(e.datepicker.dpDiv);var i=Array.prototype.slice.call(arguments,1);return"string"!=typeof t||"isDisabled"!==t&&"getDate"!==t&&"widget"!==t?"option"===t&&2===arguments.length&&"string"==typeof arguments[1]?e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this[0]].concat(i)):this.each(function(){"string"==typeof t?e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this].concat(i)):e.datepicker._attachDatepicker(this,t)}):e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this[0]].concat(i))},e.datepicker=new n,e.datepicker.initialized=!1,e.datepicker.uuid=(new Date).getTime(),e.datepicker.version="1.11.4",e.datepicker,e.widget("ui.draggable",e.ui.mouse,{version:"1.11.4",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"===this.options.helper&&this._setPositionRelative(),this.options.addClasses&&this.element.addClass("ui-draggable"),this.options.disabled&&this.element.addClass("ui-draggable-disabled"),this._setHandleClassName(),this._mouseInit()},_setOption:function(e,t){this._super(e,t),"handle"===e&&(this._removeHandleClassName(),this._setHandleClassName())},_destroy:function(){return(this.helper||this.element).is(".ui-draggable-dragging")?(this.destroyOnClear=!0,void 0):(this.element.removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled"),this._removeHandleClassName(),this._mouseDestroy(),void 0)},_mouseCapture:function(t){var i=this.options;return this._blurActiveElement(t),this.helper||i.disabled||e(t.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(t),this.handle?(this._blockFrames(i.iframeFix===!0?"iframe":i.iframeFix),!0):!1)},_blockFrames:function(t){this.iframeBlocks=this.document.find(t).map(function(){var t=e(this);return e("
    ").css("position","absolute").appendTo(t.parent()).outerWidth(t.outerWidth()).outerHeight(t.outerHeight()).offset(t.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(t){var i=this.document[0];if(this.handleElement.is(t.target))try{i.activeElement&&"body"!==i.activeElement.nodeName.toLowerCase()&&e(i.activeElement).blur()}catch(s){}},_mouseStart:function(t){var i=this.options;return this.helper=this._createHelper(t),this.helper.addClass("ui-draggable-dragging"),this._cacheHelperProportions(),e.ui.ddmanager&&(e.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=this.helper.parents().filter(function(){return"fixed"===e(this).css("position")}).length>0,this.positionAbs=this.element.offset(),this._refreshOffsets(t),this.originalPosition=this.position=this._generatePosition(t,!1),this.originalPageX=t.pageX,this.originalPageY=t.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this._setContainment(),this._trigger("start",t)===!1?(this._clear(),!1):(this._cacheHelperProportions(),e.ui.ddmanager&&!i.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t),this._normalizeRightBottom(),this._mouseDrag(t,!0),e.ui.ddmanager&&e.ui.ddmanager.dragStart(this,t),!0)},_refreshOffsets:function(e){this.offset={top:this.positionAbs.top-this.margins.top,left:this.positionAbs.left-this.margins.left,scroll:!1,parent:this._getParentOffset(),relative:this._getRelativeOffset()},this.offset.click={left:e.pageX-this.offset.left,top:e.pageY-this.offset.top}},_mouseDrag:function(t,i){if(this.hasFixedAncestor&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(t,!0),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",t,s)===!1)return this._mouseUp({}),!1;this.position=s.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",e.ui.ddmanager&&e.ui.ddmanager.drag(this,t),!1},_mouseStop:function(t){var i=this,s=!1;return e.ui.ddmanager&&!this.options.dropBehaviour&&(s=e.ui.ddmanager.drop(this,t)),this.dropped&&(s=this.dropped,this.dropped=!1),"invalid"===this.options.revert&&!s||"valid"===this.options.revert&&s||this.options.revert===!0||e.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?e(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){i._trigger("stop",t)!==!1&&i._clear()}):this._trigger("stop",t)!==!1&&this._clear(),!1},_mouseUp:function(t){return this._unblockFrames(),e.ui.ddmanager&&e.ui.ddmanager.dragStop(this,t),this.handleElement.is(t.target)&&this.element.focus(),e.ui.mouse.prototype._mouseUp.call(this,t)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear(),this},_getHandle:function(t){return this.options.handle?!!e(t.target).closest(this.element.find(this.options.handle)).length:!0},_setHandleClassName:function(){this.handleElement=this.options.handle?this.element.find(this.options.handle):this.element,this.handleElement.addClass("ui-draggable-handle")},_removeHandleClassName:function(){this.handleElement.removeClass("ui-draggable-handle")},_createHelper:function(t){var i=this.options,s=e.isFunction(i.helper),n=s?e(i.helper.apply(this.element[0],[t])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return n.parents("body").length||n.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s&&n[0]===this.element[0]&&this._setPositionRelative(),n[0]===this.element[0]||/(fixed|absolute)/.test(n.css("position"))||n.css("position","absolute"),n},_setPositionRelative:function(){/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative")},_adjustOffsetFromHelper:function(t){"string"==typeof t&&(t=t.split(" ")),e.isArray(t)&&(t={left:+t[0],top:+t[1]||0}),"left"in t&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_isRootNode:function(e){return/(html|body)/i.test(e.tagName)||e===this.document[0]},_getParentOffset:function(){var t=this.offsetParent.offset(),i=this.document[0];return"absolute"===this.cssPosition&&this.scrollParent[0]!==i&&e.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop()),this._isRootNode(this.offsetParent[0])&&(t={top:0,left:0}),{top:t.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"!==this.cssPosition)return{top:0,left:0};var e=this.element.position(),t=this._isRootNode(this.scrollParent[0]);return{top:e.top-(parseInt(this.helper.css("top"),10)||0)+(t?0:this.scrollParent.scrollTop()),left:e.left-(parseInt(this.helper.css("left"),10)||0)+(t?0:this.scrollParent.scrollLeft())}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t,i,s,n=this.options,a=this.document[0];return this.relativeContainer=null,n.containment?"window"===n.containment?(this.containment=[e(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,e(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,e(window).scrollLeft()+e(window).width()-this.helperProportions.width-this.margins.left,e(window).scrollTop()+(e(window).height()||a.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):"document"===n.containment?(this.containment=[0,0,e(a).width()-this.helperProportions.width-this.margins.left,(e(a).height()||a.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):n.containment.constructor===Array?(this.containment=n.containment,void 0):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=e(n.containment),s=i[0],s&&(t=/(scroll|auto)/.test(i.css("overflow")),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(t?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(t?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=i),void 0):(this.containment=null,void 0) -},_convertPositionTo:function(e,t){t||(t=this.position);var i="absolute"===e?1:-1,s=this._isRootNode(this.scrollParent[0]);return{top:t.top+this.offset.relative.top*i+this.offset.parent.top*i-("fixed"===this.cssPosition?-this.offset.scroll.top:s?0:this.offset.scroll.top)*i,left:t.left+this.offset.relative.left*i+this.offset.parent.left*i-("fixed"===this.cssPosition?-this.offset.scroll.left:s?0:this.offset.scroll.left)*i}},_generatePosition:function(e,t){var i,s,n,a,o=this.options,r=this._isRootNode(this.scrollParent[0]),h=e.pageX,l=e.pageY;return r&&this.offset.scroll||(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),t&&(this.containment&&(this.relativeContainer?(s=this.relativeContainer.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,e.pageX-this.offset.click.lefti[2]&&(h=i[2]+this.offset.click.left),e.pageY-this.offset.click.top>i[3]&&(l=i[3]+this.offset.click.top)),o.grid&&(n=o.grid[1]?this.originalPageY+Math.round((l-this.originalPageY)/o.grid[1])*o.grid[1]:this.originalPageY,l=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-o.grid[1]:n+o.grid[1]:n,a=o.grid[0]?this.originalPageX+Math.round((h-this.originalPageX)/o.grid[0])*o.grid[0]:this.originalPageX,h=i?a-this.offset.click.left>=i[0]||a-this.offset.click.left>i[2]?a:a-this.offset.click.left>=i[0]?a-o.grid[0]:a+o.grid[0]:a),"y"===o.axis&&(h=this.originalPageX),"x"===o.axis&&(l=this.originalPageY)),{top:l-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:r?0:this.offset.scroll.top),left:h-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:r?0:this.offset.scroll.left)}},_clear:function(){this.helper.removeClass("ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_normalizeRightBottom:function(){"y"!==this.options.axis&&"auto"!==this.helper.css("right")&&(this.helper.width(this.helper.width()),this.helper.css("right","auto")),"x"!==this.options.axis&&"auto"!==this.helper.css("bottom")&&(this.helper.height(this.helper.height()),this.helper.css("bottom","auto"))},_trigger:function(t,i,s){return s=s||this._uiHash(),e.ui.plugin.call(this,t,[i,s,this],!0),/^(drag|start|stop)/.test(t)&&(this.positionAbs=this._convertPositionTo("absolute"),s.offset=this.positionAbs),e.Widget.prototype._trigger.call(this,t,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),e.ui.plugin.add("draggable","connectToSortable",{start:function(t,i,s){var n=e.extend({},i,{item:s.element});s.sortables=[],e(s.options.connectToSortable).each(function(){var i=e(this).sortable("instance");i&&!i.options.disabled&&(s.sortables.push(i),i.refreshPositions(),i._trigger("activate",t,n))})},stop:function(t,i,s){var n=e.extend({},i,{item:s.element});s.cancelHelperRemoval=!1,e.each(s.sortables,function(){var e=this;e.isOver?(e.isOver=0,s.cancelHelperRemoval=!0,e.cancelHelperRemoval=!1,e._storedCSS={position:e.placeholder.css("position"),top:e.placeholder.css("top"),left:e.placeholder.css("left")},e._mouseStop(t),e.options.helper=e.options._helper):(e.cancelHelperRemoval=!0,e._trigger("deactivate",t,n))})},drag:function(t,i,s){e.each(s.sortables,function(){var n=!1,a=this;a.positionAbs=s.positionAbs,a.helperProportions=s.helperProportions,a.offset.click=s.offset.click,a._intersectsWith(a.containerCache)&&(n=!0,e.each(s.sortables,function(){return this.positionAbs=s.positionAbs,this.helperProportions=s.helperProportions,this.offset.click=s.offset.click,this!==a&&this._intersectsWith(this.containerCache)&&e.contains(a.element[0],this.element[0])&&(n=!1),n})),n?(a.isOver||(a.isOver=1,s._parent=i.helper.parent(),a.currentItem=i.helper.appendTo(a.element).data("ui-sortable-item",!0),a.options._helper=a.options.helper,a.options.helper=function(){return i.helper[0]},t.target=a.currentItem[0],a._mouseCapture(t,!0),a._mouseStart(t,!0,!0),a.offset.click.top=s.offset.click.top,a.offset.click.left=s.offset.click.left,a.offset.parent.left-=s.offset.parent.left-a.offset.parent.left,a.offset.parent.top-=s.offset.parent.top-a.offset.parent.top,s._trigger("toSortable",t),s.dropped=a.element,e.each(s.sortables,function(){this.refreshPositions()}),s.currentItem=s.element,a.fromOutside=s),a.currentItem&&(a._mouseDrag(t),i.position=a.position)):a.isOver&&(a.isOver=0,a.cancelHelperRemoval=!0,a.options._revert=a.options.revert,a.options.revert=!1,a._trigger("out",t,a._uiHash(a)),a._mouseStop(t,!0),a.options.revert=a.options._revert,a.options.helper=a.options._helper,a.placeholder&&a.placeholder.remove(),i.helper.appendTo(s._parent),s._refreshOffsets(t),i.position=s._generatePosition(t,!0),s._trigger("fromSortable",t),s.dropped=!1,e.each(s.sortables,function(){this.refreshPositions()}))})}}),e.ui.plugin.add("draggable","cursor",{start:function(t,i,s){var n=e("body"),a=s.options;n.css("cursor")&&(a._cursor=n.css("cursor")),n.css("cursor",a.cursor)},stop:function(t,i,s){var n=s.options;n._cursor&&e("body").css("cursor",n._cursor)}}),e.ui.plugin.add("draggable","opacity",{start:function(t,i,s){var n=e(i.helper),a=s.options;n.css("opacity")&&(a._opacity=n.css("opacity")),n.css("opacity",a.opacity)},stop:function(t,i,s){var n=s.options;n._opacity&&e(i.helper).css("opacity",n._opacity)}}),e.ui.plugin.add("draggable","scroll",{start:function(e,t,i){i.scrollParentNotHidden||(i.scrollParentNotHidden=i.helper.scrollParent(!1)),i.scrollParentNotHidden[0]!==i.document[0]&&"HTML"!==i.scrollParentNotHidden[0].tagName&&(i.overflowOffset=i.scrollParentNotHidden.offset())},drag:function(t,i,s){var n=s.options,a=!1,o=s.scrollParentNotHidden[0],r=s.document[0];o!==r&&"HTML"!==o.tagName?(n.axis&&"x"===n.axis||(s.overflowOffset.top+o.offsetHeight-t.pageY=0;c--)h=s.snapElements[c].left-s.margins.left,l=h+s.snapElements[c].width,u=s.snapElements[c].top-s.margins.top,d=u+s.snapElements[c].height,h-m>v||g>l+m||u-m>b||y>d+m||!e.contains(s.snapElements[c].item.ownerDocument,s.snapElements[c].item)?(s.snapElements[c].snapping&&s.options.snap.release&&s.options.snap.release.call(s.element,t,e.extend(s._uiHash(),{snapItem:s.snapElements[c].item})),s.snapElements[c].snapping=!1):("inner"!==f.snapMode&&(n=m>=Math.abs(u-b),a=m>=Math.abs(d-y),o=m>=Math.abs(h-v),r=m>=Math.abs(l-g),n&&(i.position.top=s._convertPositionTo("relative",{top:u-s.helperProportions.height,left:0}).top),a&&(i.position.top=s._convertPositionTo("relative",{top:d,left:0}).top),o&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h-s.helperProportions.width}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l}).left)),p=n||a||o||r,"outer"!==f.snapMode&&(n=m>=Math.abs(u-y),a=m>=Math.abs(d-b),o=m>=Math.abs(h-g),r=m>=Math.abs(l-v),n&&(i.position.top=s._convertPositionTo("relative",{top:u,left:0}).top),a&&(i.position.top=s._convertPositionTo("relative",{top:d-s.helperProportions.height,left:0}).top),o&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l-s.helperProportions.width}).left)),!s.snapElements[c].snapping&&(n||a||o||r||p)&&s.options.snap.snap&&s.options.snap.snap.call(s.element,t,e.extend(s._uiHash(),{snapItem:s.snapElements[c].item})),s.snapElements[c].snapping=n||a||o||r||p)}}),e.ui.plugin.add("draggable","stack",{start:function(t,i,s){var n,a=s.options,o=e.makeArray(e(a.stack)).sort(function(t,i){return(parseInt(e(t).css("zIndex"),10)||0)-(parseInt(e(i).css("zIndex"),10)||0)});o.length&&(n=parseInt(e(o[0]).css("zIndex"),10)||0,e(o).each(function(t){e(this).css("zIndex",n+t)}),this.css("zIndex",n+o.length))}}),e.ui.plugin.add("draggable","zIndex",{start:function(t,i,s){var n=e(i.helper),a=s.options;n.css("zIndex")&&(a._zIndex=n.css("zIndex")),n.css("zIndex",a.zIndex)},stop:function(t,i,s){var n=s.options;n._zIndex&&e(i.helper).css("zIndex",n._zIndex)}}),e.ui.draggable,e.widget("ui.resizable",e.ui.mouse,{version:"1.11.4",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(e){return parseInt(e,10)||0},_isNumber:function(e){return!isNaN(parseInt(e,10))},_hasScroll:function(t,i){if("hidden"===e(t).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return t[s]>0?!0:(t[s]=1,n=t[s]>0,t[s]=0,n)},_create:function(){var t,i,s,n,a,o=this,r=this.options;if(this.element.addClass("ui-resizable"),e.extend(this,{_aspectRatio:!!r.aspectRatio,aspectRatio:r.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:r.helper||r.ghost||r.animate?r.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)&&(this.element.wrap(e("
    ").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")}),this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0}),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css({margin:this.originalElement.css("margin")}),this._proportionallyResize()),this.handles=r.handles||(e(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this._handles=e(),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),t=this.handles.split(","),this.handles={},i=0;t.length>i;i++)s=e.trim(t[i]),a="ui-resizable-"+s,n=e("
    "),n.css({zIndex:r.zIndex}),"se"===s&&n.addClass("ui-icon ui-icon-gripsmall-diagonal-se"),this.handles[s]=".ui-resizable-"+s,this.element.append(n);this._renderAxis=function(t){var i,s,n,a;t=t||this.element;for(i in this.handles)this.handles[i].constructor===String?this.handles[i]=this.element.children(this.handles[i]).first().show():(this.handles[i].jquery||this.handles[i].nodeType)&&(this.handles[i]=e(this.handles[i]),this._on(this.handles[i],{mousedown:o._mouseDown})),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(s=e(this.handles[i],this.element),a=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),t.css(n,a),this._proportionallyResize()),this._handles=this._handles.add(this.handles[i])},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.mouseover(function(){o.resizing||(this.className&&(n=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),o.axis=n&&n[1]?n[1]:"se")}),r.autoHide&&(this._handles.hide(),e(this.element).addClass("ui-resizable-autohide").mouseenter(function(){r.disabled||(e(this).removeClass("ui-resizable-autohide"),o._handles.show())}).mouseleave(function(){r.disabled||o.resizing||(e(this).addClass("ui-resizable-autohide"),o._handles.hide())})),this._mouseInit()},_destroy:function(){this._mouseDestroy();var t,i=function(t){e(t).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),t=this.element,this.originalElement.css({position:t.css("position"),width:t.outerWidth(),height:t.outerHeight(),top:t.css("top"),left:t.css("left")}).insertAfter(t),t.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_mouseCapture:function(t){var i,s,n=!1;for(i in this.handles)s=e(this.handles[i])[0],(s===t.target||e.contains(s,t.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(t){var i,s,n,a=this.options,o=this.element;return this.resizing=!0,this._renderProxy(),i=this._num(this.helper.css("left")),s=this._num(this.helper.css("top")),a.containment&&(i+=e(a.containment).scrollLeft()||0,s+=e(a.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:i,top:s},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:o.width(),height:o.height()},this.originalSize=this._helper?{width:o.outerWidth(),height:o.outerHeight()}:{width:o.width(),height:o.height()},this.sizeDiff={width:o.outerWidth()-o.width(),height:o.outerHeight()-o.height()},this.originalPosition={left:i,top:s},this.originalMousePosition={left:t.pageX,top:t.pageY},this.aspectRatio="number"==typeof a.aspectRatio?a.aspectRatio:this.originalSize.width/this.originalSize.height||1,n=e(".ui-resizable-"+this.axis).css("cursor"),e("body").css("cursor","auto"===n?this.axis+"-resize":n),o.addClass("ui-resizable-resizing"),this._propagate("start",t),!0},_mouseDrag:function(t){var i,s,n=this.originalMousePosition,a=this.axis,o=t.pageX-n.left||0,r=t.pageY-n.top||0,h=this._change[a];return this._updatePrevProperties(),h?(i=h.apply(this,[t,o,r]),this._updateVirtualBoundaries(t.shiftKey),(this._aspectRatio||t.shiftKey)&&(i=this._updateRatio(i,t)),i=this._respectSize(i,t),this._updateCache(i),this._propagate("resize",t),s=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),e.isEmptyObject(s)||(this._updatePrevProperties(),this._trigger("resize",t,this.ui()),this._applyChanges()),!1):!1},_mouseStop:function(t){this.resizing=!1;var i,s,n,a,o,r,h,l=this.options,u=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&this._hasScroll(i[0],"left")?0:u.sizeDiff.height,a=s?0:u.sizeDiff.width,o={width:u.helper.width()-a,height:u.helper.height()-n},r=parseInt(u.element.css("left"),10)+(u.position.left-u.originalPosition.left)||null,h=parseInt(u.element.css("top"),10)+(u.position.top-u.originalPosition.top)||null,l.animate||this.element.css(e.extend(o,{top:h,left:r})),u.helper.height(u.size.height),u.helper.width(u.size.width),this._helper&&!l.animate&&this._proportionallyResize()),e("body").css("cursor","auto"),this.element.removeClass("ui-resizable-resizing"),this._propagate("stop",t),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var e={};return this.position.top!==this.prevPosition.top&&(e.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(e.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(e.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(e.height=this.size.height+"px"),this.helper.css(e),e},_updateVirtualBoundaries:function(e){var t,i,s,n,a,o=this.options;a={minWidth:this._isNumber(o.minWidth)?o.minWidth:0,maxWidth:this._isNumber(o.maxWidth)?o.maxWidth:1/0,minHeight:this._isNumber(o.minHeight)?o.minHeight:0,maxHeight:this._isNumber(o.maxHeight)?o.maxHeight:1/0},(this._aspectRatio||e)&&(t=a.minHeight*this.aspectRatio,s=a.minWidth/this.aspectRatio,i=a.maxHeight*this.aspectRatio,n=a.maxWidth/this.aspectRatio,t>a.minWidth&&(a.minWidth=t),s>a.minHeight&&(a.minHeight=s),a.maxWidth>i&&(a.maxWidth=i),a.maxHeight>n&&(a.maxHeight=n)),this._vBoundaries=a},_updateCache:function(e){this.offset=this.helper.offset(),this._isNumber(e.left)&&(this.position.left=e.left),this._isNumber(e.top)&&(this.position.top=e.top),this._isNumber(e.height)&&(this.size.height=e.height),this._isNumber(e.width)&&(this.size.width=e.width)},_updateRatio:function(e){var t=this.position,i=this.size,s=this.axis;return this._isNumber(e.height)?e.width=e.height*this.aspectRatio:this._isNumber(e.width)&&(e.height=e.width/this.aspectRatio),"sw"===s&&(e.left=t.left+(i.width-e.width),e.top=null),"nw"===s&&(e.top=t.top+(i.height-e.height),e.left=t.left+(i.width-e.width)),e},_respectSize:function(e){var t=this._vBoundaries,i=this.axis,s=this._isNumber(e.width)&&t.maxWidth&&t.maxWidthe.width,o=this._isNumber(e.height)&&t.minHeight&&t.minHeight>e.height,r=this.originalPosition.left+this.originalSize.width,h=this.position.top+this.size.height,l=/sw|nw|w/.test(i),u=/nw|ne|n/.test(i);return a&&(e.width=t.minWidth),o&&(e.height=t.minHeight),s&&(e.width=t.maxWidth),n&&(e.height=t.maxHeight),a&&l&&(e.left=r-t.minWidth),s&&l&&(e.left=r-t.maxWidth),o&&u&&(e.top=h-t.minHeight),n&&u&&(e.top=h-t.maxHeight),e.width||e.height||e.left||!e.top?e.width||e.height||e.top||!e.left||(e.left=null):e.top=null,e},_getPaddingPlusBorderDimensions:function(e){for(var t=0,i=[],s=[e.css("borderTopWidth"),e.css("borderRightWidth"),e.css("borderBottomWidth"),e.css("borderLeftWidth")],n=[e.css("paddingTop"),e.css("paddingRight"),e.css("paddingBottom"),e.css("paddingLeft")];4>t;t++)i[t]=parseInt(s[t],10)||0,i[t]+=parseInt(n[t],10)||0;return{height:i[0]+i[2],width:i[1]+i[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var e,t=0,i=this.helper||this.element;this._proportionallyResizeElements.length>t;t++)e=this._proportionallyResizeElements[t],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(e)),e.css({height:i.height()-this.outerDimensions.height||0,width:i.width()-this.outerDimensions.width||0})},_renderProxy:function(){var t=this.element,i=this.options;this.elementOffset=t.offset(),this._helper?(this.helper=this.helper||e("
    "),this.helper.addClass(this._helper).css({width:this.element.outerWidth()-1,height:this.element.outerHeight()-1,position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(e,t){return{width:this.originalSize.width+t}},w:function(e,t){var i=this.originalSize,s=this.originalPosition;return{left:s.left+t,width:i.width-t}},n:function(e,t,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(e,t,i){return{height:this.originalSize.height+i}},se:function(t,i,s){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[t,i,s]))},sw:function(t,i,s){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[t,i,s]))},ne:function(t,i,s){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[t,i,s]))},nw:function(t,i,s){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[t,i,s]))}},_propagate:function(t,i){e.ui.plugin.call(this,t,[i,this.ui()]),"resize"!==t&&this._trigger(t,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),e.ui.plugin.add("resizable","animate",{stop:function(t){var i=e(this).resizable("instance"),s=i.options,n=i._proportionallyResizeElements,a=n.length&&/textarea/i.test(n[0].nodeName),o=a&&i._hasScroll(n[0],"left")?0:i.sizeDiff.height,r=a?0:i.sizeDiff.width,h={width:i.size.width-r,height:i.size.height-o},l=parseInt(i.element.css("left"),10)+(i.position.left-i.originalPosition.left)||null,u=parseInt(i.element.css("top"),10)+(i.position.top-i.originalPosition.top)||null;i.element.animate(e.extend(h,u&&l?{top:u,left:l}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseInt(i.element.css("width"),10),height:parseInt(i.element.css("height"),10),top:parseInt(i.element.css("top"),10),left:parseInt(i.element.css("left"),10)};n&&n.length&&e(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",t)}})}}),e.ui.plugin.add("resizable","containment",{start:function(){var t,i,s,n,a,o,r,h=e(this).resizable("instance"),l=h.options,u=h.element,d=l.containment,c=d instanceof e?d.get(0):/parent/.test(d)?u.parent().get(0):d;c&&(h.containerElement=e(c),/document/.test(d)||d===document?(h.containerOffset={left:0,top:0},h.containerPosition={left:0,top:0},h.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}):(t=e(c),i=[],e(["Top","Right","Left","Bottom"]).each(function(e,s){i[e]=h._num(t.css("padding"+s))}),h.containerOffset=t.offset(),h.containerPosition=t.position(),h.containerSize={height:t.innerHeight()-i[3],width:t.innerWidth()-i[1]},s=h.containerOffset,n=h.containerSize.height,a=h.containerSize.width,o=h._hasScroll(c,"left")?c.scrollWidth:a,r=h._hasScroll(c)?c.scrollHeight:n,h.parentData={element:c,left:s.left,top:s.top,width:o,height:r}))},resize:function(t){var i,s,n,a,o=e(this).resizable("instance"),r=o.options,h=o.containerOffset,l=o.position,u=o._aspectRatio||t.shiftKey,d={top:0,left:0},c=o.containerElement,p=!0;c[0]!==document&&/static/.test(c.css("position"))&&(d=h),l.left<(o._helper?h.left:0)&&(o.size.width=o.size.width+(o._helper?o.position.left-h.left:o.position.left-d.left),u&&(o.size.height=o.size.width/o.aspectRatio,p=!1),o.position.left=r.helper?h.left:0),l.top<(o._helper?h.top:0)&&(o.size.height=o.size.height+(o._helper?o.position.top-h.top:o.position.top),u&&(o.size.width=o.size.height*o.aspectRatio,p=!1),o.position.top=o._helper?h.top:0),n=o.containerElement.get(0)===o.element.parent().get(0),a=/relative|absolute/.test(o.containerElement.css("position")),n&&a?(o.offset.left=o.parentData.left+o.position.left,o.offset.top=o.parentData.top+o.position.top):(o.offset.left=o.element.offset().left,o.offset.top=o.element.offset().top),i=Math.abs(o.sizeDiff.width+(o._helper?o.offset.left-d.left:o.offset.left-h.left)),s=Math.abs(o.sizeDiff.height+(o._helper?o.offset.top-d.top:o.offset.top-h.top)),i+o.size.width>=o.parentData.width&&(o.size.width=o.parentData.width-i,u&&(o.size.height=o.size.width/o.aspectRatio,p=!1)),s+o.size.height>=o.parentData.height&&(o.size.height=o.parentData.height-s,u&&(o.size.width=o.size.height*o.aspectRatio,p=!1)),p||(o.position.left=o.prevPosition.left,o.position.top=o.prevPosition.top,o.size.width=o.prevSize.width,o.size.height=o.prevSize.height)},stop:function(){var t=e(this).resizable("instance"),i=t.options,s=t.containerOffset,n=t.containerPosition,a=t.containerElement,o=e(t.helper),r=o.offset(),h=o.outerWidth()-t.sizeDiff.width,l=o.outerHeight()-t.sizeDiff.height;t._helper&&!i.animate&&/relative/.test(a.css("position"))&&e(this).css({left:r.left-n.left-s.left,width:h,height:l}),t._helper&&!i.animate&&/static/.test(a.css("position"))&&e(this).css({left:r.left-n.left-s.left,width:h,height:l})}}),e.ui.plugin.add("resizable","alsoResize",{start:function(){var t=e(this).resizable("instance"),i=t.options;e(i.alsoResize).each(function(){var t=e(this);t.data("ui-resizable-alsoresize",{width:parseInt(t.width(),10),height:parseInt(t.height(),10),left:parseInt(t.css("left"),10),top:parseInt(t.css("top"),10)})})},resize:function(t,i){var s=e(this).resizable("instance"),n=s.options,a=s.originalSize,o=s.originalPosition,r={height:s.size.height-a.height||0,width:s.size.width-a.width||0,top:s.position.top-o.top||0,left:s.position.left-o.left||0};e(n.alsoResize).each(function(){var t=e(this),s=e(this).data("ui-resizable-alsoresize"),n={},a=t.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(a,function(e,t){var i=(s[t]||0)+(r[t]||0);i&&i>=0&&(n[t]=i||null)}),t.css(n)})},stop:function(){e(this).removeData("resizable-alsoresize")}}),e.ui.plugin.add("resizable","ghost",{start:function(){var t=e(this).resizable("instance"),i=t.options,s=t.size;t.ghost=t.originalElement.clone(),t.ghost.css({opacity:.25,display:"block",position:"relative",height:s.height,width:s.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass("string"==typeof i.ghost?i.ghost:""),t.ghost.appendTo(t.helper)},resize:function(){var t=e(this).resizable("instance");t.ghost&&t.ghost.css({position:"relative",height:t.size.height,width:t.size.width})},stop:function(){var t=e(this).resizable("instance");t.ghost&&t.helper&&t.helper.get(0).removeChild(t.ghost.get(0))}}),e.ui.plugin.add("resizable","grid",{resize:function(){var t,i=e(this).resizable("instance"),s=i.options,n=i.size,a=i.originalSize,o=i.originalPosition,r=i.axis,h="number"==typeof s.grid?[s.grid,s.grid]:s.grid,l=h[0]||1,u=h[1]||1,d=Math.round((n.width-a.width)/l)*l,c=Math.round((n.height-a.height)/u)*u,p=a.width+d,f=a.height+c,m=s.maxWidth&&p>s.maxWidth,g=s.maxHeight&&f>s.maxHeight,v=s.minWidth&&s.minWidth>p,y=s.minHeight&&s.minHeight>f;s.grid=h,v&&(p+=l),y&&(f+=u),m&&(p-=l),g&&(f-=u),/^(se|s|e)$/.test(r)?(i.size.width=p,i.size.height=f):/^(ne)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.top=o.top-c):/^(sw)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.left=o.left-d):((0>=f-u||0>=p-l)&&(t=i._getPaddingPlusBorderDimensions(this)),f-u>0?(i.size.height=f,i.position.top=o.top-c):(f=u-t.height,i.size.height=f,i.position.top=o.top+a.height-f),p-l>0?(i.size.width=p,i.position.left=o.left-d):(p=l-t.width,i.size.width=p,i.position.left=o.left+a.width-p))}}),e.ui.resizable,e.widget("ui.dialog",{version:"1.11.4",options:{appendTo:"body",autoOpen:!0,buttons:[],closeOnEscape:!0,closeText:"Close",dialogClass:"",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(t){var i=e(this).css(t).offset().top;0>i&&e(this).css("top",t.top-i)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},sizeRelatedOptions:{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},resizableRelatedOptions:{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),this.options.title=this.options.title||this.originalTitle,this._createWrapper(),this.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(this.uiDialog),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&e.fn.draggable&&this._makeDraggable(),this.options.resizable&&e.fn.resizable&&this._makeResizable(),this._isOpen=!1,this._trackFocus()},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var t=this.options.appendTo;return t&&(t.jquery||t.nodeType)?e(t):this.document.find(t||"body").eq(0)},_destroy:function(){var e,t=this.originalPosition;this._untrackInstance(),this._destroyOverlay(),this.element.removeUniqueId().removeClass("ui-dialog-content ui-widget-content").css(this.originalCss).detach(),this.uiDialog.stop(!0,!0).remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),e=t.parent.children().eq(t.index),e.length&&e[0]!==this.element[0]?e.before(this.element):t.parent.append(this.element)},widget:function(){return this.uiDialog},disable:e.noop,enable:e.noop,close:function(t){var i,s=this;if(this._isOpen&&this._trigger("beforeClose",t)!==!1){if(this._isOpen=!1,this._focusedElement=null,this._destroyOverlay(),this._untrackInstance(),!this.opener.filter(":focusable").focus().length)try{i=this.document[0].activeElement,i&&"body"!==i.nodeName.toLowerCase()&&e(i).blur()}catch(n){}this._hide(this.uiDialog,this.options.hide,function(){s._trigger("close",t)})}},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(t,i){var s=!1,n=this.uiDialog.siblings(".ui-front:visible").map(function(){return+e(this).css("z-index")}).get(),a=Math.max.apply(null,n);return a>=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",a+1),s=!0),s&&!i&&this._trigger("focus",t),s},open:function(){var t=this;return this._isOpen?(this._moveToTop()&&this._focusTabbable(),void 0):(this._isOpen=!0,this.opener=e(this.document[0].activeElement),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this.overlay&&this.overlay.css("z-index",this.uiDialog.css("z-index")-1),this._show(this.uiDialog,this.options.show,function(){t._focusTabbable(),t._trigger("focus")}),this._makeFocusTarget(),this._trigger("open"),void 0)},_focusTabbable:function(){var e=this._focusedElement;e||(e=this.element.find("[autofocus]")),e.length||(e=this.element.find(":tabbable")),e.length||(e=this.uiDialogButtonPane.find(":tabbable")),e.length||(e=this.uiDialogTitlebarClose.filter(":tabbable")),e.length||(e=this.uiDialog),e.eq(0).focus()},_keepFocus:function(t){function i(){var t=this.document[0].activeElement,i=this.uiDialog[0]===t||e.contains(this.uiDialog[0],t);i||this._focusTabbable()}t.preventDefault(),i.call(this),this._delay(i)},_createWrapper:function(){this.uiDialog=e("
    ").addClass("ui-dialog ui-widget ui-widget-content ui-corner-all ui-front "+this.options.dialogClass).hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._on(this.uiDialog,{keydown:function(t){if(this.options.closeOnEscape&&!t.isDefaultPrevented()&&t.keyCode&&t.keyCode===e.ui.keyCode.ESCAPE)return t.preventDefault(),this.close(t),void 0; -if(t.keyCode===e.ui.keyCode.TAB&&!t.isDefaultPrevented()){var i=this.uiDialog.find(":tabbable"),s=i.filter(":first"),n=i.filter(":last");t.target!==n[0]&&t.target!==this.uiDialog[0]||t.shiftKey?t.target!==s[0]&&t.target!==this.uiDialog[0]||!t.shiftKey||(this._delay(function(){n.focus()}),t.preventDefault()):(this._delay(function(){s.focus()}),t.preventDefault())}},mousedown:function(e){this._moveToTop(e)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var t;this.uiDialogTitlebar=e("
    ").addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(this.uiDialog),this._on(this.uiDialogTitlebar,{mousedown:function(t){e(t.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.focus()}}),this.uiDialogTitlebarClose=e("").button({label:this.options.closeText,icons:{primary:"ui-icon-closethick"},text:!1}).addClass("ui-dialog-titlebar-close").appendTo(this.uiDialogTitlebar),this._on(this.uiDialogTitlebarClose,{click:function(e){e.preventDefault(),this.close(e)}}),t=e("").uniqueId().addClass("ui-dialog-title").prependTo(this.uiDialogTitlebar),this._title(t),this.uiDialog.attr({"aria-labelledby":t.attr("id")})},_title:function(e){this.options.title||e.html(" "),e.text(this.options.title)},_createButtonPane:function(){this.uiDialogButtonPane=e("
    ").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),this.uiButtonSet=e("
    ").addClass("ui-dialog-buttonset").appendTo(this.uiDialogButtonPane),this._createButtons()},_createButtons:function(){var t=this,i=this.options.buttons;return this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),e.isEmptyObject(i)||e.isArray(i)&&!i.length?(this.uiDialog.removeClass("ui-dialog-buttons"),void 0):(e.each(i,function(i,s){var n,a;s=e.isFunction(s)?{click:s,text:i}:s,s=e.extend({type:"button"},s),n=s.click,s.click=function(){n.apply(t.element[0],arguments)},a={icons:s.icons,text:s.showText},delete s.icons,delete s.showText,e("",s).button(a).appendTo(t.uiButtonSet)}),this.uiDialog.addClass("ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog),void 0)},_makeDraggable:function(){function t(e){return{position:e.position,offset:e.offset}}var i=this,s=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(s,n){e(this).addClass("ui-dialog-dragging"),i._blockFrames(),i._trigger("dragStart",s,t(n))},drag:function(e,s){i._trigger("drag",e,t(s))},stop:function(n,a){var o=a.offset.left-i.document.scrollLeft(),r=a.offset.top-i.document.scrollTop();s.position={my:"left top",at:"left"+(o>=0?"+":"")+o+" "+"top"+(r>=0?"+":"")+r,of:i.window},e(this).removeClass("ui-dialog-dragging"),i._unblockFrames(),i._trigger("dragStop",n,t(a))}})},_makeResizable:function(){function t(e){return{originalPosition:e.originalPosition,originalSize:e.originalSize,position:e.position,size:e.size}}var i=this,s=this.options,n=s.resizable,a=this.uiDialog.css("position"),o="string"==typeof n?n:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:s.maxWidth,maxHeight:s.maxHeight,minWidth:s.minWidth,minHeight:this._minHeight(),handles:o,start:function(s,n){e(this).addClass("ui-dialog-resizing"),i._blockFrames(),i._trigger("resizeStart",s,t(n))},resize:function(e,s){i._trigger("resize",e,t(s))},stop:function(n,a){var o=i.uiDialog.offset(),r=o.left-i.document.scrollLeft(),h=o.top-i.document.scrollTop();s.height=i.uiDialog.height(),s.width=i.uiDialog.width(),s.position={my:"left top",at:"left"+(r>=0?"+":"")+r+" "+"top"+(h>=0?"+":"")+h,of:i.window},e(this).removeClass("ui-dialog-resizing"),i._unblockFrames(),i._trigger("resizeStop",n,t(a))}}).css("position",a)},_trackFocus:function(){this._on(this.widget(),{focusin:function(t){this._makeFocusTarget(),this._focusedElement=e(t.target)}})},_makeFocusTarget:function(){this._untrackInstance(),this._trackingInstances().unshift(this)},_untrackInstance:function(){var t=this._trackingInstances(),i=e.inArray(this,t);-1!==i&&t.splice(i,1)},_trackingInstances:function(){var e=this.document.data("ui-dialog-instances");return e||(e=[],this.document.data("ui-dialog-instances",e)),e},_minHeight:function(){var e=this.options;return"auto"===e.height?e.minHeight:Math.min(e.minHeight,e.height)},_position:function(){var e=this.uiDialog.is(":visible");e||this.uiDialog.show(),this.uiDialog.position(this.options.position),e||this.uiDialog.hide()},_setOptions:function(t){var i=this,s=!1,n={};e.each(t,function(e,t){i._setOption(e,t),e in i.sizeRelatedOptions&&(s=!0),e in i.resizableRelatedOptions&&(n[e]=t)}),s&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",n)},_setOption:function(e,t){var i,s,n=this.uiDialog;"dialogClass"===e&&n.removeClass(this.options.dialogClass).addClass(t),"disabled"!==e&&(this._super(e,t),"appendTo"===e&&this.uiDialog.appendTo(this._appendTo()),"buttons"===e&&this._createButtons(),"closeText"===e&&this.uiDialogTitlebarClose.button({label:""+t}),"draggable"===e&&(i=n.is(":data(ui-draggable)"),i&&!t&&n.draggable("destroy"),!i&&t&&this._makeDraggable()),"position"===e&&this._position(),"resizable"===e&&(s=n.is(":data(ui-resizable)"),s&&!t&&n.resizable("destroy"),s&&"string"==typeof t&&n.resizable("option","handles",t),s||t===!1||this._makeResizable()),"title"===e&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var e,t,i,s=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),s.minWidth>s.width&&(s.width=s.minWidth),e=this.uiDialog.css({height:"auto",width:s.width}).outerHeight(),t=Math.max(0,s.minHeight-e),i="number"==typeof s.maxHeight?Math.max(0,s.maxHeight-e):"none","auto"===s.height?this.element.css({minHeight:t,maxHeight:i,height:"auto"}):this.element.height(Math.max(0,s.height-e)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var t=e(this);return e("
    ").css({position:"absolute",width:t.outerWidth(),height:t.outerHeight()}).appendTo(t.parent()).offset(t.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(t){return e(t.target).closest(".ui-dialog").length?!0:!!e(t.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var t=!0;this._delay(function(){t=!1}),this.document.data("ui-dialog-overlays")||this._on(this.document,{focusin:function(e){t||this._allowInteraction(e)||(e.preventDefault(),this._trackingInstances()[0]._focusTabbable())}}),this.overlay=e("
    ").addClass("ui-widget-overlay ui-front").appendTo(this._appendTo()),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1)}},_destroyOverlay:function(){if(this.options.modal&&this.overlay){var e=this.document.data("ui-dialog-overlays")-1;e?this.document.data("ui-dialog-overlays",e):this.document.unbind("focusin").removeData("ui-dialog-overlays"),this.overlay.remove(),this.overlay=null}}}),e.widget("ui.droppable",{version:"1.11.4",widgetEventPrefix:"drop",options:{accept:"*",activeClass:!1,addClasses:!0,greedy:!1,hoverClass:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var t,i=this.options,s=i.accept;this.isover=!1,this.isout=!0,this.accept=e.isFunction(s)?s:function(e){return e.is(s)},this.proportions=function(){return arguments.length?(t=arguments[0],void 0):t?t:t={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight}},this._addToManager(i.scope),i.addClasses&&this.element.addClass("ui-droppable")},_addToManager:function(t){e.ui.ddmanager.droppables[t]=e.ui.ddmanager.droppables[t]||[],e.ui.ddmanager.droppables[t].push(this)},_splice:function(e){for(var t=0;e.length>t;t++)e[t]===this&&e.splice(t,1)},_destroy:function(){var t=e.ui.ddmanager.droppables[this.options.scope];this._splice(t),this.element.removeClass("ui-droppable ui-droppable-disabled")},_setOption:function(t,i){if("accept"===t)this.accept=e.isFunction(i)?i:function(e){return e.is(i)};else if("scope"===t){var s=e.ui.ddmanager.droppables[this.options.scope];this._splice(s),this._addToManager(i)}this._super(t,i)},_activate:function(t){var i=e.ui.ddmanager.current;this.options.activeClass&&this.element.addClass(this.options.activeClass),i&&this._trigger("activate",t,this.ui(i))},_deactivate:function(t){var i=e.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass),i&&this._trigger("deactivate",t,this.ui(i))},_over:function(t){var i=e.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.addClass(this.options.hoverClass),this._trigger("over",t,this.ui(i)))},_out:function(t){var i=e.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("out",t,this.ui(i)))},_drop:function(t,i){var s=i||e.ui.ddmanager.current,n=!1;return s&&(s.currentItem||s.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var i=e(this).droppable("instance");return i.options.greedy&&!i.options.disabled&&i.options.scope===s.options.scope&&i.accept.call(i.element[0],s.currentItem||s.element)&&e.ui.intersect(s,e.extend(i,{offset:i.element.offset()}),i.options.tolerance,t)?(n=!0,!1):void 0}),n?!1:this.accept.call(this.element[0],s.currentItem||s.element)?(this.options.activeClass&&this.element.removeClass(this.options.activeClass),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("drop",t,this.ui(s)),this.element):!1):!1},ui:function(e){return{draggable:e.currentItem||e.element,helper:e.helper,position:e.position,offset:e.positionAbs}}}),e.ui.intersect=function(){function e(e,t,i){return e>=t&&t+i>e}return function(t,i,s,n){if(!i.offset)return!1;var a=(t.positionAbs||t.position.absolute).left+t.margins.left,o=(t.positionAbs||t.position.absolute).top+t.margins.top,r=a+t.helperProportions.width,h=o+t.helperProportions.height,l=i.offset.left,u=i.offset.top,d=l+i.proportions().width,c=u+i.proportions().height;switch(s){case"fit":return a>=l&&d>=r&&o>=u&&c>=h;case"intersect":return a+t.helperProportions.width/2>l&&d>r-t.helperProportions.width/2&&o+t.helperProportions.height/2>u&&c>h-t.helperProportions.height/2;case"pointer":return e(n.pageY,u,i.proportions().height)&&e(n.pageX,l,i.proportions().width);case"touch":return(o>=u&&c>=o||h>=u&&c>=h||u>o&&h>c)&&(a>=l&&d>=a||r>=l&&d>=r||l>a&&r>d);default:return!1}}}(),e.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(t,i){var s,n,a=e.ui.ddmanager.droppables[t.options.scope]||[],o=i?i.type:null,r=(t.currentItem||t.element).find(":data(ui-droppable)").addBack();e:for(s=0;a.length>s;s++)if(!(a[s].options.disabled||t&&!a[s].accept.call(a[s].element[0],t.currentItem||t.element))){for(n=0;r.length>n;n++)if(r[n]===a[s].element[0]){a[s].proportions().height=0;continue e}a[s].visible="none"!==a[s].element.css("display"),a[s].visible&&("mousedown"===o&&a[s]._activate.call(a[s],i),a[s].offset=a[s].element.offset(),a[s].proportions({width:a[s].element[0].offsetWidth,height:a[s].element[0].offsetHeight}))}},drop:function(t,i){var s=!1;return e.each((e.ui.ddmanager.droppables[t.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&e.ui.intersect(t,this,this.options.tolerance,i)&&(s=this._drop.call(this,i)||s),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],t.currentItem||t.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,i)))}),s},dragStart:function(t,i){t.element.parentsUntil("body").bind("scroll.droppable",function(){t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,i)})},drag:function(t,i){t.options.refreshPositions&&e.ui.ddmanager.prepareOffsets(t,i),e.each(e.ui.ddmanager.droppables[t.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var s,n,a,o=e.ui.intersect(t,this,this.options.tolerance,i),r=!o&&this.isover?"isout":o&&!this.isover?"isover":null;r&&(this.options.greedy&&(n=this.options.scope,a=this.element.parents(":data(ui-droppable)").filter(function(){return e(this).droppable("instance").options.scope===n}),a.length&&(s=e(a[0]).droppable("instance"),s.greedyChild="isover"===r)),s&&"isover"===r&&(s.isover=!1,s.isout=!0,s._out.call(s,i)),this[r]=!0,this["isout"===r?"isover":"isout"]=!1,this["isover"===r?"_over":"_out"].call(this,i),s&&"isout"===r&&(s.isout=!1,s.isover=!0,s._over.call(s,i)))}})},dragStop:function(t,i){t.element.parentsUntil("body").unbind("scroll.droppable"),t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,i)}},e.ui.droppable;var y="ui-effects-",b=e;e.effects={effect:{}},function(e,t){function i(e,t,i){var s=d[t.type]||{};return null==e?i||!t.def?null:t.def:(e=s.floor?~~e:parseFloat(e),isNaN(e)?t.def:s.mod?(e+s.mod)%s.mod:0>e?0:e>s.max?s.max:e)}function s(i){var s=l(),n=s._rgba=[];return i=i.toLowerCase(),f(h,function(e,a){var o,r=a.re.exec(i),h=r&&a.parse(r),l=a.space||"rgba";return h?(o=s[l](h),s[u[l].cache]=o[u[l].cache],n=s._rgba=o._rgba,!1):t}),n.length?("0,0,0,0"===n.join()&&e.extend(n,a.transparent),s):a[i]}function n(e,t,i){return i=(i+1)%1,1>6*i?e+6*(t-e)*i:1>2*i?t:2>3*i?e+6*(t-e)*(2/3-i):e}var a,o="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",r=/^([\-+])=\s*(\d+\.?\d*)/,h=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(e){return[e[1],e[2],e[3],e[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(e){return[2.55*e[1],2.55*e[2],2.55*e[3],e[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(e){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(e){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(e){return[e[1],e[2]/100,e[3]/100,e[4]]}}],l=e.Color=function(t,i,s,n){return new e.Color.fn.parse(t,i,s,n)},u={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},d={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},c=l.support={},p=e("

    ")[0],f=e.each;p.style.cssText="background-color:rgba(1,1,1,.5)",c.rgba=p.style.backgroundColor.indexOf("rgba")>-1,f(u,function(e,t){t.cache="_"+e,t.props.alpha={idx:3,type:"percent",def:1}}),l.fn=e.extend(l.prototype,{parse:function(n,o,r,h){if(n===t)return this._rgba=[null,null,null,null],this;(n.jquery||n.nodeType)&&(n=e(n).css(o),o=t);var d=this,c=e.type(n),p=this._rgba=[];return o!==t&&(n=[n,o,r,h],c="array"),"string"===c?this.parse(s(n)||a._default):"array"===c?(f(u.rgba.props,function(e,t){p[t.idx]=i(n[t.idx],t)}),this):"object"===c?(n instanceof l?f(u,function(e,t){n[t.cache]&&(d[t.cache]=n[t.cache].slice())}):f(u,function(t,s){var a=s.cache;f(s.props,function(e,t){if(!d[a]&&s.to){if("alpha"===e||null==n[e])return;d[a]=s.to(d._rgba)}d[a][t.idx]=i(n[e],t,!0)}),d[a]&&0>e.inArray(null,d[a].slice(0,3))&&(d[a][3]=1,s.from&&(d._rgba=s.from(d[a])))}),this):t},is:function(e){var i=l(e),s=!0,n=this;return f(u,function(e,a){var o,r=i[a.cache];return r&&(o=n[a.cache]||a.to&&a.to(n._rgba)||[],f(a.props,function(e,i){return null!=r[i.idx]?s=r[i.idx]===o[i.idx]:t})),s}),s},_space:function(){var e=[],t=this;return f(u,function(i,s){t[s.cache]&&e.push(i)}),e.pop()},transition:function(e,t){var s=l(e),n=s._space(),a=u[n],o=0===this.alpha()?l("transparent"):this,r=o[a.cache]||a.to(o._rgba),h=r.slice();return s=s[a.cache],f(a.props,function(e,n){var a=n.idx,o=r[a],l=s[a],u=d[n.type]||{};null!==l&&(null===o?h[a]=l:(u.mod&&(l-o>u.mod/2?o+=u.mod:o-l>u.mod/2&&(o-=u.mod)),h[a]=i((l-o)*t+o,n)))}),this[n](h)},blend:function(t){if(1===this._rgba[3])return this;var i=this._rgba.slice(),s=i.pop(),n=l(t)._rgba;return l(e.map(i,function(e,t){return(1-s)*n[t]+s*e}))},toRgbaString:function(){var t="rgba(",i=e.map(this._rgba,function(e,t){return null==e?t>2?1:0:e});return 1===i[3]&&(i.pop(),t="rgb("),t+i.join()+")"},toHslaString:function(){var t="hsla(",i=e.map(this.hsla(),function(e,t){return null==e&&(e=t>2?1:0),t&&3>t&&(e=Math.round(100*e)+"%"),e});return 1===i[3]&&(i.pop(),t="hsl("),t+i.join()+")"},toHexString:function(t){var i=this._rgba.slice(),s=i.pop();return t&&i.push(~~(255*s)),"#"+e.map(i,function(e){return e=(e||0).toString(16),1===e.length?"0"+e:e}).join("")},toString:function(){return 0===this._rgba[3]?"transparent":this.toRgbaString()}}),l.fn.parse.prototype=l.fn,u.hsla.to=function(e){if(null==e[0]||null==e[1]||null==e[2])return[null,null,null,e[3]];var t,i,s=e[0]/255,n=e[1]/255,a=e[2]/255,o=e[3],r=Math.max(s,n,a),h=Math.min(s,n,a),l=r-h,u=r+h,d=.5*u;return t=h===r?0:s===r?60*(n-a)/l+360:n===r?60*(a-s)/l+120:60*(s-n)/l+240,i=0===l?0:.5>=d?l/u:l/(2-u),[Math.round(t)%360,i,d,null==o?1:o]},u.hsla.from=function(e){if(null==e[0]||null==e[1]||null==e[2])return[null,null,null,e[3]];var t=e[0]/360,i=e[1],s=e[2],a=e[3],o=.5>=s?s*(1+i):s+i-s*i,r=2*s-o;return[Math.round(255*n(r,o,t+1/3)),Math.round(255*n(r,o,t)),Math.round(255*n(r,o,t-1/3)),a]},f(u,function(s,n){var a=n.props,o=n.cache,h=n.to,u=n.from;l.fn[s]=function(s){if(h&&!this[o]&&(this[o]=h(this._rgba)),s===t)return this[o].slice();var n,r=e.type(s),d="array"===r||"object"===r?s:arguments,c=this[o].slice();return f(a,function(e,t){var s=d["object"===r?e:t.idx];null==s&&(s=c[t.idx]),c[t.idx]=i(s,t)}),u?(n=l(u(c)),n[o]=c,n):l(c)},f(a,function(t,i){l.fn[t]||(l.fn[t]=function(n){var a,o=e.type(n),h="alpha"===t?this._hsla?"hsla":"rgba":s,l=this[h](),u=l[i.idx];return"undefined"===o?u:("function"===o&&(n=n.call(this,u),o=e.type(n)),null==n&&i.empty?this:("string"===o&&(a=r.exec(n),a&&(n=u+parseFloat(a[2])*("+"===a[1]?1:-1))),l[i.idx]=n,this[h](l)))})})}),l.hook=function(t){var i=t.split(" ");f(i,function(t,i){e.cssHooks[i]={set:function(t,n){var a,o,r="";if("transparent"!==n&&("string"!==e.type(n)||(a=s(n)))){if(n=l(a||n),!c.rgba&&1!==n._rgba[3]){for(o="backgroundColor"===i?t.parentNode:t;(""===r||"transparent"===r)&&o&&o.style;)try{r=e.css(o,"backgroundColor"),o=o.parentNode}catch(h){}n=n.blend(r&&"transparent"!==r?r:"_default")}n=n.toRgbaString()}try{t.style[i]=n}catch(h){}}},e.fx.step[i]=function(t){t.colorInit||(t.start=l(t.elem,i),t.end=l(t.end),t.colorInit=!0),e.cssHooks[i].set(t.elem,t.start.transition(t.end,t.pos))}})},l.hook(o),e.cssHooks.borderColor={expand:function(e){var t={};return f(["Top","Right","Bottom","Left"],function(i,s){t["border"+s+"Color"]=e}),t}},a=e.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(b),function(){function t(t){var i,s,n=t.ownerDocument.defaultView?t.ownerDocument.defaultView.getComputedStyle(t,null):t.currentStyle,a={};if(n&&n.length&&n[0]&&n[n[0]])for(s=n.length;s--;)i=n[s],"string"==typeof n[i]&&(a[e.camelCase(i)]=n[i]);else for(i in n)"string"==typeof n[i]&&(a[i]=n[i]);return a}function i(t,i){var s,a,o={};for(s in i)a=i[s],t[s]!==a&&(n[s]||(e.fx.step[s]||!isNaN(parseFloat(a)))&&(o[s]=a));return o}var s=["add","remove","toggle"],n={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};e.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(t,i){e.fx.step[i]=function(e){("none"!==e.end&&!e.setAttr||1===e.pos&&!e.setAttr)&&(b.style(e.elem,i,e.end),e.setAttr=!0)}}),e.fn.addBack||(e.fn.addBack=function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}),e.effects.animateClass=function(n,a,o,r){var h=e.speed(a,o,r);return this.queue(function(){var a,o=e(this),r=o.attr("class")||"",l=h.children?o.find("*").addBack():o;l=l.map(function(){var i=e(this);return{el:i,start:t(this)}}),a=function(){e.each(s,function(e,t){n[t]&&o[t+"Class"](n[t])})},a(),l=l.map(function(){return this.end=t(this.el[0]),this.diff=i(this.start,this.end),this}),o.attr("class",r),l=l.map(function(){var t=this,i=e.Deferred(),s=e.extend({},h,{queue:!1,complete:function(){i.resolve(t)}});return this.el.animate(this.diff,s),i.promise()}),e.when.apply(e,l.get()).done(function(){a(),e.each(arguments,function(){var t=this.el;e.each(this.diff,function(e){t.css(e,"")})}),h.complete.call(o[0])})})},e.fn.extend({addClass:function(t){return function(i,s,n,a){return s?e.effects.animateClass.call(this,{add:i},s,n,a):t.apply(this,arguments)}}(e.fn.addClass),removeClass:function(t){return function(i,s,n,a){return arguments.length>1?e.effects.animateClass.call(this,{remove:i},s,n,a):t.apply(this,arguments)}}(e.fn.removeClass),toggleClass:function(t){return function(i,s,n,a,o){return"boolean"==typeof s||void 0===s?n?e.effects.animateClass.call(this,s?{add:i}:{remove:i},n,a,o):t.apply(this,arguments):e.effects.animateClass.call(this,{toggle:i},s,n,a)}}(e.fn.toggleClass),switchClass:function(t,i,s,n,a){return e.effects.animateClass.call(this,{add:i,remove:t},s,n,a)}})}(),function(){function t(t,i,s,n){return e.isPlainObject(t)&&(i=t,t=t.effect),t={effect:t},null==i&&(i={}),e.isFunction(i)&&(n=i,s=null,i={}),("number"==typeof i||e.fx.speeds[i])&&(n=s,s=i,i={}),e.isFunction(s)&&(n=s,s=null),i&&e.extend(t,i),s=s||i.duration,t.duration=e.fx.off?0:"number"==typeof s?s:s in e.fx.speeds?e.fx.speeds[s]:e.fx.speeds._default,t.complete=n||i.complete,t}function i(t){return!t||"number"==typeof t||e.fx.speeds[t]?!0:"string"!=typeof t||e.effects.effect[t]?e.isFunction(t)?!0:"object"!=typeof t||t.effect?!1:!0:!0}e.extend(e.effects,{version:"1.11.4",save:function(e,t){for(var i=0;t.length>i;i++)null!==t[i]&&e.data(y+t[i],e[0].style[t[i]])},restore:function(e,t){var i,s;for(s=0;t.length>s;s++)null!==t[s]&&(i=e.data(y+t[s]),void 0===i&&(i=""),e.css(t[s],i))},setMode:function(e,t){return"toggle"===t&&(t=e.is(":hidden")?"show":"hide"),t},getBaseline:function(e,t){var i,s;switch(e[0]){case"top":i=0;break;case"middle":i=.5;break;case"bottom":i=1;break;default:i=e[0]/t.height}switch(e[1]){case"left":s=0;break;case"center":s=.5;break;case"right":s=1;break;default:s=e[1]/t.width}return{x:s,y:i}},createWrapper:function(t){if(t.parent().is(".ui-effects-wrapper"))return t.parent();var i={width:t.outerWidth(!0),height:t.outerHeight(!0),"float":t.css("float")},s=e("

    ").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),n={width:t.width(),height:t.height()},a=document.activeElement;try{a.id}catch(o){a=document.body}return t.wrap(s),(t[0]===a||e.contains(t[0],a))&&e(a).focus(),s=t.parent(),"static"===t.css("position")?(s.css({position:"relative"}),t.css({position:"relative"})):(e.extend(i,{position:t.css("position"),zIndex:t.css("z-index")}),e.each(["top","left","bottom","right"],function(e,s){i[s]=t.css(s),isNaN(parseInt(i[s],10))&&(i[s]="auto")}),t.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),t.css(n),s.css(i).show()},removeWrapper:function(t){var i=document.activeElement;return t.parent().is(".ui-effects-wrapper")&&(t.parent().replaceWith(t),(t[0]===i||e.contains(t[0],i))&&e(i).focus()),t},setTransition:function(t,i,s,n){return n=n||{},e.each(i,function(e,i){var a=t.cssUnit(i);a[0]>0&&(n[i]=a[0]*s+a[1])}),n}}),e.fn.extend({effect:function(){function i(t){function i(){e.isFunction(a)&&a.call(n[0]),e.isFunction(t)&&t()}var n=e(this),a=s.complete,r=s.mode;(n.is(":hidden")?"hide"===r:"show"===r)?(n[r](),i()):o.call(n[0],s,i)}var s=t.apply(this,arguments),n=s.mode,a=s.queue,o=e.effects.effect[s.effect];return e.fx.off||!o?n?this[n](s.duration,s.complete):this.each(function(){s.complete&&s.complete.call(this)}):a===!1?this.each(i):this.queue(a||"fx",i)},show:function(e){return function(s){if(i(s))return e.apply(this,arguments);var n=t.apply(this,arguments);return n.mode="show",this.effect.call(this,n)}}(e.fn.show),hide:function(e){return function(s){if(i(s))return e.apply(this,arguments);var n=t.apply(this,arguments);return n.mode="hide",this.effect.call(this,n)}}(e.fn.hide),toggle:function(e){return function(s){if(i(s)||"boolean"==typeof s)return e.apply(this,arguments);var n=t.apply(this,arguments);return n.mode="toggle",this.effect.call(this,n)}}(e.fn.toggle),cssUnit:function(t){var i=this.css(t),s=[];return e.each(["em","px","%","pt"],function(e,t){i.indexOf(t)>0&&(s=[parseFloat(i),t])}),s}})}(),function(){var t={};e.each(["Quad","Cubic","Quart","Quint","Expo"],function(e,i){t[i]=function(t){return Math.pow(t,e+2)}}),e.extend(t,{Sine:function(e){return 1-Math.cos(e*Math.PI/2)},Circ:function(e){return 1-Math.sqrt(1-e*e)},Elastic:function(e){return 0===e||1===e?e:-Math.pow(2,8*(e-1))*Math.sin((80*(e-1)-7.5)*Math.PI/15)},Back:function(e){return e*e*(3*e-2)},Bounce:function(e){for(var t,i=4;((t=Math.pow(2,--i))-1)/11>e;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*t-2)/22-e,2)}}),e.each(t,function(t,i){e.easing["easeIn"+t]=i,e.easing["easeOut"+t]=function(e){return 1-i(1-e)},e.easing["easeInOut"+t]=function(e){return.5>e?i(2*e)/2:1-i(-2*e+2)/2}})}(),e.effects,e.effects.effect.blind=function(t,i){var s,n,a,o=e(this),r=/up|down|vertical/,h=/up|left|vertical|horizontal/,l=["position","top","bottom","left","right","height","width"],u=e.effects.setMode(o,t.mode||"hide"),d=t.direction||"up",c=r.test(d),p=c?"height":"width",f=c?"top":"left",m=h.test(d),g={},v="show"===u;o.parent().is(".ui-effects-wrapper")?e.effects.save(o.parent(),l):e.effects.save(o,l),o.show(),s=e.effects.createWrapper(o).css({overflow:"hidden"}),n=s[p](),a=parseFloat(s.css(f))||0,g[p]=v?n:0,m||(o.css(c?"bottom":"right",0).css(c?"top":"left","auto").css({position:"absolute"}),g[f]=v?a:n+a),v&&(s.css(p,0),m||s.css(f,a+n)),s.animate(g,{duration:t.duration,easing:t.easing,queue:!1,complete:function(){"hide"===u&&o.hide(),e.effects.restore(o,l),e.effects.removeWrapper(o),i()}})},e.effects.effect.bounce=function(t,i){var s,n,a,o=e(this),r=["position","top","bottom","left","right","height","width"],h=e.effects.setMode(o,t.mode||"effect"),l="hide"===h,u="show"===h,d=t.direction||"up",c=t.distance,p=t.times||5,f=2*p+(u||l?1:0),m=t.duration/f,g=t.easing,v="up"===d||"down"===d?"top":"left",y="up"===d||"left"===d,b=o.queue(),_=b.length;for((u||l)&&r.push("opacity"),e.effects.save(o,r),o.show(),e.effects.createWrapper(o),c||(c=o["top"===v?"outerHeight":"outerWidth"]()/3),u&&(a={opacity:1},a[v]=0,o.css("opacity",0).css(v,y?2*-c:2*c).animate(a,m,g)),l&&(c/=Math.pow(2,p-1)),a={},a[v]=0,s=0;p>s;s++)n={},n[v]=(y?"-=":"+=")+c,o.animate(n,m,g).animate(a,m,g),c=l?2*c:c/2;l&&(n={opacity:0},n[v]=(y?"-=":"+=")+c,o.animate(n,m,g)),o.queue(function(){l&&o.hide(),e.effects.restore(o,r),e.effects.removeWrapper(o),i()}),_>1&&b.splice.apply(b,[1,0].concat(b.splice(_,f+1))),o.dequeue()},e.effects.effect.clip=function(t,i){var s,n,a,o=e(this),r=["position","top","bottom","left","right","height","width"],h=e.effects.setMode(o,t.mode||"hide"),l="show"===h,u=t.direction||"vertical",d="vertical"===u,c=d?"height":"width",p=d?"top":"left",f={};e.effects.save(o,r),o.show(),s=e.effects.createWrapper(o).css({overflow:"hidden"}),n="IMG"===o[0].tagName?s:o,a=n[c](),l&&(n.css(c,0),n.css(p,a/2)),f[c]=l?a:0,f[p]=l?0:a/2,n.animate(f,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){l||o.hide(),e.effects.restore(o,r),e.effects.removeWrapper(o),i()}})},e.effects.effect.drop=function(t,i){var s,n=e(this),a=["position","top","bottom","left","right","opacity","height","width"],o=e.effects.setMode(n,t.mode||"hide"),r="show"===o,h=t.direction||"left",l="up"===h||"down"===h?"top":"left",u="up"===h||"left"===h?"pos":"neg",d={opacity:r?1:0};e.effects.save(n,a),n.show(),e.effects.createWrapper(n),s=t.distance||n["top"===l?"outerHeight":"outerWidth"](!0)/2,r&&n.css("opacity",0).css(l,"pos"===u?-s:s),d[l]=(r?"pos"===u?"+=":"-=":"pos"===u?"-=":"+=")+s,n.animate(d,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){"hide"===o&&n.hide(),e.effects.restore(n,a),e.effects.removeWrapper(n),i()}})},e.effects.effect.explode=function(t,i){function s(){b.push(this),b.length===d*c&&n()}function n(){p.css({visibility:"visible"}),e(b).remove(),m||p.hide(),i()}var a,o,r,h,l,u,d=t.pieces?Math.round(Math.sqrt(t.pieces)):3,c=d,p=e(this),f=e.effects.setMode(p,t.mode||"hide"),m="show"===f,g=p.show().css("visibility","hidden").offset(),v=Math.ceil(p.outerWidth()/c),y=Math.ceil(p.outerHeight()/d),b=[];for(a=0;d>a;a++)for(h=g.top+a*y,u=a-(d-1)/2,o=0;c>o;o++)r=g.left+o*v,l=o-(c-1)/2,p.clone().appendTo("body").wrap("
    ").css({position:"absolute",visibility:"visible",left:-o*v,top:-a*y}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:v,height:y,left:r+(m?l*v:0),top:h+(m?u*y:0),opacity:m?0:1}).animate({left:r+(m?0:l*v),top:h+(m?0:u*y),opacity:m?1:0},t.duration||500,t.easing,s)},e.effects.effect.fade=function(t,i){var s=e(this),n=e.effects.setMode(s,t.mode||"toggle");s.animate({opacity:n},{queue:!1,duration:t.duration,easing:t.easing,complete:i})},e.effects.effect.fold=function(t,i){var s,n,a=e(this),o=["position","top","bottom","left","right","height","width"],r=e.effects.setMode(a,t.mode||"hide"),h="show"===r,l="hide"===r,u=t.size||15,d=/([0-9]+)%/.exec(u),c=!!t.horizFirst,p=h!==c,f=p?["width","height"]:["height","width"],m=t.duration/2,g={},v={};e.effects.save(a,o),a.show(),s=e.effects.createWrapper(a).css({overflow:"hidden"}),n=p?[s.width(),s.height()]:[s.height(),s.width()],d&&(u=parseInt(d[1],10)/100*n[l?0:1]),h&&s.css(c?{height:0,width:u}:{height:u,width:0}),g[f[0]]=h?n[0]:u,v[f[1]]=h?n[1]:0,s.animate(g,m,t.easing).animate(v,m,t.easing,function(){l&&a.hide(),e.effects.restore(a,o),e.effects.removeWrapper(a),i()})},e.effects.effect.highlight=function(t,i){var s=e(this),n=["backgroundImage","backgroundColor","opacity"],a=e.effects.setMode(s,t.mode||"show"),o={backgroundColor:s.css("backgroundColor")};"hide"===a&&(o.opacity=0),e.effects.save(s,n),s.show().css({backgroundImage:"none",backgroundColor:t.color||"#ffff99"}).animate(o,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){"hide"===a&&s.hide(),e.effects.restore(s,n),i()}})},e.effects.effect.size=function(t,i){var s,n,a,o=e(this),r=["position","top","bottom","left","right","width","height","overflow","opacity"],h=["position","top","bottom","left","right","overflow","opacity"],l=["width","height","overflow"],u=["fontSize"],d=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],c=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],p=e.effects.setMode(o,t.mode||"effect"),f=t.restore||"effect"!==p,m=t.scale||"both",g=t.origin||["middle","center"],v=o.css("position"),y=f?r:h,b={height:0,width:0,outerHeight:0,outerWidth:0};"show"===p&&o.show(),s={height:o.height(),width:o.width(),outerHeight:o.outerHeight(),outerWidth:o.outerWidth()},"toggle"===t.mode&&"show"===p?(o.from=t.to||b,o.to=t.from||s):(o.from=t.from||("show"===p?b:s),o.to=t.to||("hide"===p?b:s)),a={from:{y:o.from.height/s.height,x:o.from.width/s.width},to:{y:o.to.height/s.height,x:o.to.width/s.width}},("box"===m||"both"===m)&&(a.from.y!==a.to.y&&(y=y.concat(d),o.from=e.effects.setTransition(o,d,a.from.y,o.from),o.to=e.effects.setTransition(o,d,a.to.y,o.to)),a.from.x!==a.to.x&&(y=y.concat(c),o.from=e.effects.setTransition(o,c,a.from.x,o.from),o.to=e.effects.setTransition(o,c,a.to.x,o.to))),("content"===m||"both"===m)&&a.from.y!==a.to.y&&(y=y.concat(u).concat(l),o.from=e.effects.setTransition(o,u,a.from.y,o.from),o.to=e.effects.setTransition(o,u,a.to.y,o.to)),e.effects.save(o,y),o.show(),e.effects.createWrapper(o),o.css("overflow","hidden").css(o.from),g&&(n=e.effects.getBaseline(g,s),o.from.top=(s.outerHeight-o.outerHeight())*n.y,o.from.left=(s.outerWidth-o.outerWidth())*n.x,o.to.top=(s.outerHeight-o.to.outerHeight)*n.y,o.to.left=(s.outerWidth-o.to.outerWidth)*n.x),o.css(o.from),("content"===m||"both"===m)&&(d=d.concat(["marginTop","marginBottom"]).concat(u),c=c.concat(["marginLeft","marginRight"]),l=r.concat(d).concat(c),o.find("*[width]").each(function(){var i=e(this),s={height:i.height(),width:i.width(),outerHeight:i.outerHeight(),outerWidth:i.outerWidth()}; -f&&e.effects.save(i,l),i.from={height:s.height*a.from.y,width:s.width*a.from.x,outerHeight:s.outerHeight*a.from.y,outerWidth:s.outerWidth*a.from.x},i.to={height:s.height*a.to.y,width:s.width*a.to.x,outerHeight:s.height*a.to.y,outerWidth:s.width*a.to.x},a.from.y!==a.to.y&&(i.from=e.effects.setTransition(i,d,a.from.y,i.from),i.to=e.effects.setTransition(i,d,a.to.y,i.to)),a.from.x!==a.to.x&&(i.from=e.effects.setTransition(i,c,a.from.x,i.from),i.to=e.effects.setTransition(i,c,a.to.x,i.to)),i.css(i.from),i.animate(i.to,t.duration,t.easing,function(){f&&e.effects.restore(i,l)})})),o.animate(o.to,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){0===o.to.opacity&&o.css("opacity",o.from.opacity),"hide"===p&&o.hide(),e.effects.restore(o,y),f||("static"===v?o.css({position:"relative",top:o.to.top,left:o.to.left}):e.each(["top","left"],function(e,t){o.css(t,function(t,i){var s=parseInt(i,10),n=e?o.to.left:o.to.top;return"auto"===i?n+"px":s+n+"px"})})),e.effects.removeWrapper(o),i()}})},e.effects.effect.scale=function(t,i){var s=e(this),n=e.extend(!0,{},t),a=e.effects.setMode(s,t.mode||"effect"),o=parseInt(t.percent,10)||(0===parseInt(t.percent,10)?0:"hide"===a?0:100),r=t.direction||"both",h=t.origin,l={height:s.height(),width:s.width(),outerHeight:s.outerHeight(),outerWidth:s.outerWidth()},u={y:"horizontal"!==r?o/100:1,x:"vertical"!==r?o/100:1};n.effect="size",n.queue=!1,n.complete=i,"effect"!==a&&(n.origin=h||["middle","center"],n.restore=!0),n.from=t.from||("show"===a?{height:0,width:0,outerHeight:0,outerWidth:0}:l),n.to={height:l.height*u.y,width:l.width*u.x,outerHeight:l.outerHeight*u.y,outerWidth:l.outerWidth*u.x},n.fade&&("show"===a&&(n.from.opacity=0,n.to.opacity=1),"hide"===a&&(n.from.opacity=1,n.to.opacity=0)),s.effect(n)},e.effects.effect.puff=function(t,i){var s=e(this),n=e.effects.setMode(s,t.mode||"hide"),a="hide"===n,o=parseInt(t.percent,10)||150,r=o/100,h={height:s.height(),width:s.width(),outerHeight:s.outerHeight(),outerWidth:s.outerWidth()};e.extend(t,{effect:"scale",queue:!1,fade:!0,mode:n,complete:i,percent:a?o:100,from:a?h:{height:h.height*r,width:h.width*r,outerHeight:h.outerHeight*r,outerWidth:h.outerWidth*r}}),s.effect(t)},e.effects.effect.pulsate=function(t,i){var s,n=e(this),a=e.effects.setMode(n,t.mode||"show"),o="show"===a,r="hide"===a,h=o||"hide"===a,l=2*(t.times||5)+(h?1:0),u=t.duration/l,d=0,c=n.queue(),p=c.length;for((o||!n.is(":visible"))&&(n.css("opacity",0).show(),d=1),s=1;l>s;s++)n.animate({opacity:d},u,t.easing),d=1-d;n.animate({opacity:d},u,t.easing),n.queue(function(){r&&n.hide(),i()}),p>1&&c.splice.apply(c,[1,0].concat(c.splice(p,l+1))),n.dequeue()},e.effects.effect.shake=function(t,i){var s,n=e(this),a=["position","top","bottom","left","right","height","width"],o=e.effects.setMode(n,t.mode||"effect"),r=t.direction||"left",h=t.distance||20,l=t.times||3,u=2*l+1,d=Math.round(t.duration/u),c="up"===r||"down"===r?"top":"left",p="up"===r||"left"===r,f={},m={},g={},v=n.queue(),y=v.length;for(e.effects.save(n,a),n.show(),e.effects.createWrapper(n),f[c]=(p?"-=":"+=")+h,m[c]=(p?"+=":"-=")+2*h,g[c]=(p?"-=":"+=")+2*h,n.animate(f,d,t.easing),s=1;l>s;s++)n.animate(m,d,t.easing).animate(g,d,t.easing);n.animate(m,d,t.easing).animate(f,d/2,t.easing).queue(function(){"hide"===o&&n.hide(),e.effects.restore(n,a),e.effects.removeWrapper(n),i()}),y>1&&v.splice.apply(v,[1,0].concat(v.splice(y,u+1))),n.dequeue()},e.effects.effect.slide=function(t,i){var s,n=e(this),a=["position","top","bottom","left","right","width","height"],o=e.effects.setMode(n,t.mode||"show"),r="show"===o,h=t.direction||"left",l="up"===h||"down"===h?"top":"left",u="up"===h||"left"===h,d={};e.effects.save(n,a),n.show(),s=t.distance||n["top"===l?"outerHeight":"outerWidth"](!0),e.effects.createWrapper(n).css({overflow:"hidden"}),r&&n.css(l,u?isNaN(s)?"-"+s:-s:s),d[l]=(r?u?"+=":"-=":u?"-=":"+=")+s,n.animate(d,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){"hide"===o&&n.hide(),e.effects.restore(n,a),e.effects.removeWrapper(n),i()}})},e.effects.effect.transfer=function(t,i){var s=e(this),n=e(t.to),a="fixed"===n.css("position"),o=e("body"),r=a?o.scrollTop():0,h=a?o.scrollLeft():0,l=n.offset(),u={top:l.top-r,left:l.left-h,height:n.innerHeight(),width:n.innerWidth()},d=s.offset(),c=e("
    ").appendTo(document.body).addClass(t.className).css({top:d.top-r,left:d.left-h,height:s.innerHeight(),width:s.innerWidth(),position:a?"fixed":"absolute"}).animate(u,t.duration,t.easing,function(){c.remove(),i()})},e.widget("ui.progressbar",{version:"1.11.4",options:{max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min}),this.valueDiv=e("
    ").appendTo(this.element),this._refreshValue()},_destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.valueDiv.remove()},value:function(e){return void 0===e?this.options.value:(this.options.value=this._constrainedValue(e),this._refreshValue(),void 0)},_constrainedValue:function(e){return void 0===e&&(e=this.options.value),this.indeterminate=e===!1,"number"!=typeof e&&(e=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,e))},_setOptions:function(e){var t=e.value;delete e.value,this._super(e),this.options.value=this._constrainedValue(t),this._refreshValue()},_setOption:function(e,t){"max"===e&&(t=Math.max(this.min,t)),"disabled"===e&&this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this._super(e,t)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var t=this.options.value,i=this._percentage();this.valueDiv.toggle(this.indeterminate||t>this.min).toggleClass("ui-corner-right",t===this.options.max).width(i.toFixed(0)+"%"),this.element.toggleClass("ui-progressbar-indeterminate",this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=e("
    ").appendTo(this.valueDiv))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":t}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==t&&(this.oldValue=t,this._trigger("change")),t===this.options.max&&this._trigger("complete")}}),e.widget("ui.selectable",e.ui.mouse,{version:"1.11.4",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var t,i=this;this.element.addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){t=e(i.options.filter,i.element[0]),t.addClass("ui-selectee"),t.each(function(){var t=e(this),i=t.offset();e.data(this,"selectable-item",{element:this,$element:t,left:i.left,top:i.top,right:i.left+t.outerWidth(),bottom:i.top+t.outerHeight(),startselected:!1,selected:t.hasClass("ui-selected"),selecting:t.hasClass("ui-selecting"),unselecting:t.hasClass("ui-unselecting")})})},this.refresh(),this.selectees=t.addClass("ui-selectee"),this._mouseInit(),this.helper=e("
    ")},_destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item"),this.element.removeClass("ui-selectable ui-selectable-disabled"),this._mouseDestroy()},_mouseStart:function(t){var i=this,s=this.options;this.opos=[t.pageX,t.pageY],this.options.disabled||(this.selectees=e(s.filter,this.element[0]),this._trigger("start",t),e(s.appendTo).append(this.helper),this.helper.css({left:t.pageX,top:t.pageY,width:0,height:0}),s.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var s=e.data(this,"selectable-item");s.startselected=!0,t.metaKey||t.ctrlKey||(s.$element.removeClass("ui-selected"),s.selected=!1,s.$element.addClass("ui-unselecting"),s.unselecting=!0,i._trigger("unselecting",t,{unselecting:s.element}))}),e(t.target).parents().addBack().each(function(){var s,n=e.data(this,"selectable-item");return n?(s=!t.metaKey&&!t.ctrlKey||!n.$element.hasClass("ui-selected"),n.$element.removeClass(s?"ui-unselecting":"ui-selected").addClass(s?"ui-selecting":"ui-unselecting"),n.unselecting=!s,n.selecting=s,n.selected=s,s?i._trigger("selecting",t,{selecting:n.element}):i._trigger("unselecting",t,{unselecting:n.element}),!1):void 0}))},_mouseDrag:function(t){if(this.dragged=!0,!this.options.disabled){var i,s=this,n=this.options,a=this.opos[0],o=this.opos[1],r=t.pageX,h=t.pageY;return a>r&&(i=r,r=a,a=i),o>h&&(i=h,h=o,o=i),this.helper.css({left:a,top:o,width:r-a,height:h-o}),this.selectees.each(function(){var i=e.data(this,"selectable-item"),l=!1;i&&i.element!==s.element[0]&&("touch"===n.tolerance?l=!(i.left>r||a>i.right||i.top>h||o>i.bottom):"fit"===n.tolerance&&(l=i.left>a&&r>i.right&&i.top>o&&h>i.bottom),l?(i.selected&&(i.$element.removeClass("ui-selected"),i.selected=!1),i.unselecting&&(i.$element.removeClass("ui-unselecting"),i.unselecting=!1),i.selecting||(i.$element.addClass("ui-selecting"),i.selecting=!0,s._trigger("selecting",t,{selecting:i.element}))):(i.selecting&&((t.metaKey||t.ctrlKey)&&i.startselected?(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.$element.addClass("ui-selected"),i.selected=!0):(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.startselected&&(i.$element.addClass("ui-unselecting"),i.unselecting=!0),s._trigger("unselecting",t,{unselecting:i.element}))),i.selected&&(t.metaKey||t.ctrlKey||i.startselected||(i.$element.removeClass("ui-selected"),i.selected=!1,i.$element.addClass("ui-unselecting"),i.unselecting=!0,s._trigger("unselecting",t,{unselecting:i.element})))))}),!1}},_mouseStop:function(t){var i=this;return this.dragged=!1,e(".ui-unselecting",this.element[0]).each(function(){var s=e.data(this,"selectable-item");s.$element.removeClass("ui-unselecting"),s.unselecting=!1,s.startselected=!1,i._trigger("unselected",t,{unselected:s.element})}),e(".ui-selecting",this.element[0]).each(function(){var s=e.data(this,"selectable-item");s.$element.removeClass("ui-selecting").addClass("ui-selected"),s.selecting=!1,s.selected=!0,s.startselected=!0,i._trigger("selected",t,{selected:s.element})}),this._trigger("stop",t),this.helper.remove(),!1}}),e.widget("ui.selectmenu",{version:"1.11.4",defaultElement:"",widgetEventPrefix:"spin",options:{culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),""!==this.value()&&this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var t={},i=this.element;return e.each(["min","max","step"],function(e,s){var n=i.attr(s);void 0!==n&&n.length&&(t[s]=n)}),t},_events:{keydown:function(e){this._start(e)&&this._keydown(e)&&e.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(e){return this.cancelBlur?(delete this.cancelBlur,void 0):(this._stop(),this._refresh(),this.previous!==this.element.val()&&this._trigger("change",e),void 0)},mousewheel:function(e,t){if(t){if(!this.spinning&&!this._start(e))return!1;this._spin((t>0?1:-1)*this.options.step,e),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(e)},100),e.preventDefault()}},"mousedown .ui-spinner-button":function(t){function i(){var e=this.element[0]===this.document[0].activeElement;e||(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s}))}var s;s=this.element[0]===this.document[0].activeElement?this.previous:this.element.val(),t.preventDefault(),i.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,i.call(this)}),this._start(t)!==!1&&this._repeat(null,e(t.currentTarget).hasClass("ui-spinner-up")?1:-1,t)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(t){return e(t.currentTarget).hasClass("ui-state-active")?this._start(t)===!1?!1:(this._repeat(null,e(t.currentTarget).hasClass("ui-spinner-up")?1:-1,t),void 0):void 0},"mouseleave .ui-spinner-button":"_stop"},_draw:function(){var e=this.uiSpinner=this.element.addClass("ui-spinner-input").attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml());this.element.attr("role","spinbutton"),this.buttons=e.find(".ui-spinner-button").attr("tabIndex",-1).button().removeClass("ui-corner-all"),this.buttons.height()>Math.ceil(.5*e.height())&&e.height()>0&&e.height(e.height()),this.options.disabled&&this.disable()},_keydown:function(t){var i=this.options,s=e.ui.keyCode;switch(t.keyCode){case s.UP:return this._repeat(null,1,t),!0;case s.DOWN:return this._repeat(null,-1,t),!0;case s.PAGE_UP:return this._repeat(null,i.page,t),!0;case s.PAGE_DOWN:return this._repeat(null,-i.page,t),!0}return!1},_uiSpinnerHtml:function(){return""},_buttonHtml:function(){return""+""+""+""+""},_start:function(e){return this.spinning||this._trigger("start",e)!==!1?(this.counter||(this.counter=1),this.spinning=!0,!0):!1},_repeat:function(e,t,i){e=e||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,t,i)},e),this._spin(t*this.options.step,i)},_spin:function(e,t){var i=this.value()||0;this.counter||(this.counter=1),i=this._adjustValue(i+e*this._increment(this.counter)),this.spinning&&this._trigger("spin",t,{value:i})===!1||(this._value(i),this.counter++)},_increment:function(t){var i=this.options.incremental;return i?e.isFunction(i)?i(t):Math.floor(t*t*t/5e4-t*t/500+17*t/200+1):1},_precision:function(){var e=this._precisionOf(this.options.step);return null!==this.options.min&&(e=Math.max(e,this._precisionOf(this.options.min))),e},_precisionOf:function(e){var t=""+e,i=t.indexOf(".");return-1===i?0:t.length-i-1},_adjustValue:function(e){var t,i,s=this.options;return t=null!==s.min?s.min:0,i=e-t,i=Math.round(i/s.step)*s.step,e=t+i,e=parseFloat(e.toFixed(this._precision())),null!==s.max&&e>s.max?s.max:null!==s.min&&s.min>e?s.min:e},_stop:function(e){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",e))},_setOption:function(e,t){if("culture"===e||"numberFormat"===e){var i=this._parse(this.element.val());return this.options[e]=t,this.element.val(this._format(i)),void 0}("max"===e||"min"===e||"step"===e)&&"string"==typeof t&&(t=this._parse(t)),"icons"===e&&(this.buttons.first().find(".ui-icon").removeClass(this.options.icons.up).addClass(t.up),this.buttons.last().find(".ui-icon").removeClass(this.options.icons.down).addClass(t.down)),this._super(e,t),"disabled"===e&&(this.widget().toggleClass("ui-state-disabled",!!t),this.element.prop("disabled",!!t),this.buttons.button(t?"disable":"enable"))},_setOptions:h(function(e){this._super(e)}),_parse:function(e){return"string"==typeof e&&""!==e&&(e=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(e,10,this.options.culture):+e),""===e||isNaN(e)?null:e},_format:function(e){return""===e?"":window.Globalize&&this.options.numberFormat?Globalize.format(e,this.options.numberFormat,this.options.culture):e},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},isValid:function(){var e=this.value();return null===e?!1:e===this._adjustValue(e)},_value:function(e,t){var i;""!==e&&(i=this._parse(e),null!==i&&(t||(i=this._adjustValue(i)),e=this._format(i))),this.element.val(e),this._refresh()},_destroy:function(){this.element.removeClass("ui-spinner-input").prop("disabled",!1).removeAttr("autocomplete").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:h(function(e){this._stepUp(e)}),_stepUp:function(e){this._start()&&(this._spin((e||1)*this.options.step),this._stop())},stepDown:h(function(e){this._stepDown(e)}),_stepDown:function(e){this._start()&&(this._spin((e||1)*-this.options.step),this._stop())},pageUp:h(function(e){this._stepUp((e||1)*this.options.page)}),pageDown:h(function(e){this._stepDown((e||1)*this.options.page)}),value:function(e){return arguments.length?(h(this._value).call(this,e),void 0):this._parse(this.element.val())},widget:function(){return this.uiSpinner}}),e.widget("ui.tabs",{version:"1.11.4",delay:300,options:{active:null,collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_isLocal:function(){var e=/#.*$/;return function(t){var i,s;t=t.cloneNode(!1),i=t.href.replace(e,""),s=location.href.replace(e,"");try{i=decodeURIComponent(i)}catch(n){}try{s=decodeURIComponent(s)}catch(n){}return t.hash.length>1&&i===s}}(),_create:function(){var t=this,i=this.options;this.running=!1,this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all").toggleClass("ui-tabs-collapsible",i.collapsible),this._processTabs(),i.active=this._initialActive(),e.isArray(i.disabled)&&(i.disabled=e.unique(i.disabled.concat(e.map(this.tabs.filter(".ui-state-disabled"),function(e){return t.tabs.index(e)}))).sort()),this.active=this.options.active!==!1&&this.anchors.length?this._findActive(i.active):e(),this._refresh(),this.active.length&&this.load(i.active)},_initialActive:function(){var t=this.options.active,i=this.options.collapsible,s=location.hash.substring(1);return null===t&&(s&&this.tabs.each(function(i,n){return e(n).attr("aria-controls")===s?(t=i,!1):void 0}),null===t&&(t=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(null===t||-1===t)&&(t=this.tabs.length?0:!1)),t!==!1&&(t=this.tabs.index(this.tabs.eq(t)),-1===t&&(t=i?!1:0)),!i&&t===!1&&this.anchors.length&&(t=0),t},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):e()}},_tabKeydown:function(t){var i=e(this.document[0].activeElement).closest("li"),s=this.tabs.index(i),n=!0;if(!this._handlePageNav(t)){switch(t.keyCode){case e.ui.keyCode.RIGHT:case e.ui.keyCode.DOWN:s++;break;case e.ui.keyCode.UP:case e.ui.keyCode.LEFT:n=!1,s--;break;case e.ui.keyCode.END:s=this.anchors.length-1;break;case e.ui.keyCode.HOME:s=0;break;case e.ui.keyCode.SPACE:return t.preventDefault(),clearTimeout(this.activating),this._activate(s),void 0;case e.ui.keyCode.ENTER:return t.preventDefault(),clearTimeout(this.activating),this._activate(s===this.options.active?!1:s),void 0;default:return}t.preventDefault(),clearTimeout(this.activating),s=this._focusNextTab(s,n),t.ctrlKey||t.metaKey||(i.attr("aria-selected","false"),this.tabs.eq(s).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",s)},this.delay))}},_panelKeydown:function(t){this._handlePageNav(t)||t.ctrlKey&&t.keyCode===e.ui.keyCode.UP&&(t.preventDefault(),this.active.focus())},_handlePageNav:function(t){return t.altKey&&t.keyCode===e.ui.keyCode.PAGE_UP?(this._activate(this._focusNextTab(this.options.active-1,!1)),!0):t.altKey&&t.keyCode===e.ui.keyCode.PAGE_DOWN?(this._activate(this._focusNextTab(this.options.active+1,!0)),!0):void 0},_findNextTab:function(t,i){function s(){return t>n&&(t=0),0>t&&(t=n),t}for(var n=this.tabs.length-1;-1!==e.inArray(s(),this.options.disabled);)t=i?t+1:t-1;return t},_focusNextTab:function(e,t){return e=this._findNextTab(e,t),this.tabs.eq(e).focus(),e},_setOption:function(e,t){return"active"===e?(this._activate(t),void 0):"disabled"===e?(this._setupDisabled(t),void 0):(this._super(e,t),"collapsible"===e&&(this.element.toggleClass("ui-tabs-collapsible",t),t||this.options.active!==!1||this._activate(0)),"event"===e&&this._setupEvents(t),"heightStyle"===e&&this._setupHeightStyle(t),void 0)},_sanitizeSelector:function(e){return e?e.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var t=this.options,i=this.tablist.children(":has(a[href])");t.disabled=e.map(i.filter(".ui-state-disabled"),function(e){return i.index(e)}),this._processTabs(),t.active!==!1&&this.anchors.length?this.active.length&&!e.contains(this.tablist[0],this.active[0])?this.tabs.length===t.disabled.length?(t.active=!1,this.active=e()):this._activate(this._findNextTab(Math.max(0,t.active-1),!1)):t.active=this.tabs.index(this.active):(t.active=!1,this.active=e()),this._refresh()},_refresh:function(){this._setupDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-hidden":"true"}),this.active.length?(this.active.addClass("ui-tabs-active ui-state-active").attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}),this._getPanelForTab(this.active).show().attr({"aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var t=this,i=this.tabs,s=this.anchors,n=this.panels; -this.tablist=this._getList().addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").attr("role","tablist").delegate("> li","mousedown"+this.eventNamespace,function(t){e(this).is(".ui-state-disabled")&&t.preventDefault()}).delegate(".ui-tabs-anchor","focus"+this.eventNamespace,function(){e(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this.tabs=this.tablist.find("> li:has(a[href])").addClass("ui-state-default ui-corner-top").attr({role:"tab",tabIndex:-1}),this.anchors=this.tabs.map(function(){return e("a",this)[0]}).addClass("ui-tabs-anchor").attr({role:"presentation",tabIndex:-1}),this.panels=e(),this.anchors.each(function(i,s){var n,a,o,r=e(s).uniqueId().attr("id"),h=e(s).closest("li"),l=h.attr("aria-controls");t._isLocal(s)?(n=s.hash,o=n.substring(1),a=t.element.find(t._sanitizeSelector(n))):(o=h.attr("aria-controls")||e({}).uniqueId()[0].id,n="#"+o,a=t.element.find(n),a.length||(a=t._createPanel(o),a.insertAfter(t.panels[i-1]||t.tablist)),a.attr("aria-live","polite")),a.length&&(t.panels=t.panels.add(a)),l&&h.data("ui-tabs-aria-controls",l),h.attr({"aria-controls":o,"aria-labelledby":r}),a.attr("aria-labelledby",r)}),this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").attr("role","tabpanel"),i&&(this._off(i.not(this.tabs)),this._off(s.not(this.anchors)),this._off(n.not(this.panels)))},_getList:function(){return this.tablist||this.element.find("ol,ul").eq(0)},_createPanel:function(t){return e("
    ").attr("id",t).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").data("ui-tabs-destroy",!0)},_setupDisabled:function(t){e.isArray(t)&&(t.length?t.length===this.anchors.length&&(t=!0):t=!1);for(var i,s=0;i=this.tabs[s];s++)t===!0||-1!==e.inArray(s,t)?e(i).addClass("ui-state-disabled").attr("aria-disabled","true"):e(i).removeClass("ui-state-disabled").removeAttr("aria-disabled");this.options.disabled=t},_setupEvents:function(t){var i={};t&&e.each(t.split(" "),function(e,t){i[t]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(!0,this.anchors,{click:function(e){e.preventDefault()}}),this._on(this.anchors,i),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(t){var i,s=this.element.parent();"fill"===t?(i=s.height(),i-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var t=e(this),s=t.css("position");"absolute"!==s&&"fixed"!==s&&(i-=t.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){i-=e(this).outerHeight(!0)}),this.panels.each(function(){e(this).height(Math.max(0,i-e(this).innerHeight()+e(this).height()))}).css("overflow","auto")):"auto"===t&&(i=0,this.panels.each(function(){i=Math.max(i,e(this).height("").height())}).height(i))},_eventHandler:function(t){var i=this.options,s=this.active,n=e(t.currentTarget),a=n.closest("li"),o=a[0]===s[0],r=o&&i.collapsible,h=r?e():this._getPanelForTab(a),l=s.length?this._getPanelForTab(s):e(),u={oldTab:s,oldPanel:l,newTab:r?e():a,newPanel:h};t.preventDefault(),a.hasClass("ui-state-disabled")||a.hasClass("ui-tabs-loading")||this.running||o&&!i.collapsible||this._trigger("beforeActivate",t,u)===!1||(i.active=r?!1:this.tabs.index(a),this.active=o?e():a,this.xhr&&this.xhr.abort(),l.length||h.length||e.error("jQuery UI Tabs: Mismatching fragment identifier."),h.length&&this.load(this.tabs.index(a),t),this._toggle(t,u))},_toggle:function(t,i){function s(){a.running=!1,a._trigger("activate",t,i)}function n(){i.newTab.closest("li").addClass("ui-tabs-active ui-state-active"),o.length&&a.options.show?a._show(o,a.options.show,s):(o.show(),s())}var a=this,o=i.newPanel,r=i.oldPanel;this.running=!0,r.length&&this.options.hide?this._hide(r,this.options.hide,function(){i.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),n()}):(i.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),r.hide(),n()),r.attr("aria-hidden","true"),i.oldTab.attr({"aria-selected":"false","aria-expanded":"false"}),o.length&&r.length?i.oldTab.attr("tabIndex",-1):o.length&&this.tabs.filter(function(){return 0===e(this).attr("tabIndex")}).attr("tabIndex",-1),o.attr("aria-hidden","false"),i.newTab.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_activate:function(t){var i,s=this._findActive(t);s[0]!==this.active[0]&&(s.length||(s=this.active),i=s.find(".ui-tabs-anchor")[0],this._eventHandler({target:i,currentTarget:i,preventDefault:e.noop}))},_findActive:function(t){return t===!1?e():this.tabs.eq(t)},_getIndex:function(e){return"string"==typeof e&&(e=this.anchors.index(this.anchors.filter("[href$='"+e+"']"))),e},_destroy:function(){this.xhr&&this.xhr.abort(),this.element.removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible"),this.tablist.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").removeAttr("role"),this.anchors.removeClass("ui-tabs-anchor").removeAttr("role").removeAttr("tabIndex").removeUniqueId(),this.tablist.unbind(this.eventNamespace),this.tabs.add(this.panels).each(function(){e.data(this,"ui-tabs-destroy")?e(this).remove():e(this).removeClass("ui-state-default ui-state-active ui-state-disabled ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel").removeAttr("tabIndex").removeAttr("aria-live").removeAttr("aria-busy").removeAttr("aria-selected").removeAttr("aria-labelledby").removeAttr("aria-hidden").removeAttr("aria-expanded").removeAttr("role")}),this.tabs.each(function(){var t=e(this),i=t.data("ui-tabs-aria-controls");i?t.attr("aria-controls",i).removeData("ui-tabs-aria-controls"):t.removeAttr("aria-controls")}),this.panels.show(),"content"!==this.options.heightStyle&&this.panels.css("height","")},enable:function(t){var i=this.options.disabled;i!==!1&&(void 0===t?i=!1:(t=this._getIndex(t),i=e.isArray(i)?e.map(i,function(e){return e!==t?e:null}):e.map(this.tabs,function(e,i){return i!==t?i:null})),this._setupDisabled(i))},disable:function(t){var i=this.options.disabled;if(i!==!0){if(void 0===t)i=!0;else{if(t=this._getIndex(t),-1!==e.inArray(t,i))return;i=e.isArray(i)?e.merge([t],i).sort():[t]}this._setupDisabled(i)}},load:function(t,i){t=this._getIndex(t);var s=this,n=this.tabs.eq(t),a=n.find(".ui-tabs-anchor"),o=this._getPanelForTab(n),r={tab:n,panel:o},h=function(e,t){"abort"===t&&s.panels.stop(!1,!0),n.removeClass("ui-tabs-loading"),o.removeAttr("aria-busy"),e===s.xhr&&delete s.xhr};this._isLocal(a[0])||(this.xhr=e.ajax(this._ajaxSettings(a,i,r)),this.xhr&&"canceled"!==this.xhr.statusText&&(n.addClass("ui-tabs-loading"),o.attr("aria-busy","true"),this.xhr.done(function(e,t,n){setTimeout(function(){o.html(e),s._trigger("load",i,r),h(n,t)},1)}).fail(function(e,t){setTimeout(function(){h(e,t)},1)})))},_ajaxSettings:function(t,i,s){var n=this;return{url:t.attr("href"),beforeSend:function(t,a){return n._trigger("beforeLoad",i,e.extend({jqXHR:t,ajaxSettings:a},s))}}},_getPanelForTab:function(t){var i=e(t).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+i))}}),e.widget("ui.tooltip",{version:"1.11.4",options:{content:function(){var t=e(this).attr("title")||"";return e("").text(t).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,tooltipClass:null,track:!1,close:null,open:null},_addDescribedBy:function(t,i){var s=(t.attr("aria-describedby")||"").split(/\s+/);s.push(i),t.data("ui-tooltip-id",i).attr("aria-describedby",e.trim(s.join(" ")))},_removeDescribedBy:function(t){var i=t.data("ui-tooltip-id"),s=(t.attr("aria-describedby")||"").split(/\s+/),n=e.inArray(i,s);-1!==n&&s.splice(n,1),t.removeData("ui-tooltip-id"),s=e.trim(s.join(" ")),s?t.attr("aria-describedby",s):t.removeAttr("aria-describedby")},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.options.disabled&&this._disable(),this.liveRegion=e("
    ").attr({role:"log","aria-live":"assertive","aria-relevant":"additions"}).addClass("ui-helper-hidden-accessible").appendTo(this.document[0].body)},_setOption:function(t,i){var s=this;return"disabled"===t?(this[i?"_disable":"_enable"](),this.options[t]=i,void 0):(this._super(t,i),"content"===t&&e.each(this.tooltips,function(e,t){s._updateContent(t.element)}),void 0)},_disable:function(){var t=this;e.each(this.tooltips,function(i,s){var n=e.Event("blur");n.target=n.currentTarget=s.element[0],t.close(n,!0)}),this.element.find(this.options.items).addBack().each(function(){var t=e(this);t.is("[title]")&&t.data("ui-tooltip-title",t.attr("title")).removeAttr("title")})},_enable:function(){this.element.find(this.options.items).addBack().each(function(){var t=e(this);t.data("ui-tooltip-title")&&t.attr("title",t.data("ui-tooltip-title"))})},open:function(t){var i=this,s=e(t?t.target:this.element).closest(this.options.items);s.length&&!s.data("ui-tooltip-id")&&(s.attr("title")&&s.data("ui-tooltip-title",s.attr("title")),s.data("ui-tooltip-open",!0),t&&"mouseover"===t.type&&s.parents().each(function(){var t,s=e(this);s.data("ui-tooltip-open")&&(t=e.Event("blur"),t.target=t.currentTarget=this,i.close(t,!0)),s.attr("title")&&(s.uniqueId(),i.parents[this.id]={element:this,title:s.attr("title")},s.attr("title",""))}),this._registerCloseHandlers(t,s),this._updateContent(s,t))},_updateContent:function(e,t){var i,s=this.options.content,n=this,a=t?t.type:null;return"string"==typeof s?this._open(t,e,s):(i=s.call(e[0],function(i){n._delay(function(){e.data("ui-tooltip-open")&&(t&&(t.type=a),this._open(t,e,i))})}),i&&this._open(t,e,i),void 0)},_open:function(t,i,s){function n(e){l.of=e,o.is(":hidden")||o.position(l)}var a,o,r,h,l=e.extend({},this.options.position);if(s){if(a=this._find(i))return a.tooltip.find(".ui-tooltip-content").html(s),void 0;i.is("[title]")&&(t&&"mouseover"===t.type?i.attr("title",""):i.removeAttr("title")),a=this._tooltip(i),o=a.tooltip,this._addDescribedBy(i,o.attr("id")),o.find(".ui-tooltip-content").html(s),this.liveRegion.children().hide(),s.clone?(h=s.clone(),h.removeAttr("id").find("[id]").removeAttr("id")):h=s,e("
    ").html(h).appendTo(this.liveRegion),this.options.track&&t&&/^mouse/.test(t.type)?(this._on(this.document,{mousemove:n}),n(t)):o.position(e.extend({of:i},this.options.position)),o.hide(),this._show(o,this.options.show),this.options.show&&this.options.show.delay&&(r=this.delayedShow=setInterval(function(){o.is(":visible")&&(n(l.of),clearInterval(r))},e.fx.interval)),this._trigger("open",t,{tooltip:o})}},_registerCloseHandlers:function(t,i){var s={keyup:function(t){if(t.keyCode===e.ui.keyCode.ESCAPE){var s=e.Event(t);s.currentTarget=i[0],this.close(s,!0)}}};i[0]!==this.element[0]&&(s.remove=function(){this._removeTooltip(this._find(i).tooltip)}),t&&"mouseover"!==t.type||(s.mouseleave="close"),t&&"focusin"!==t.type||(s.focusout="close"),this._on(!0,i,s)},close:function(t){var i,s=this,n=e(t?t.currentTarget:this.element),a=this._find(n);return a?(i=a.tooltip,a.closing||(clearInterval(this.delayedShow),n.data("ui-tooltip-title")&&!n.attr("title")&&n.attr("title",n.data("ui-tooltip-title")),this._removeDescribedBy(n),a.hiding=!0,i.stop(!0),this._hide(i,this.options.hide,function(){s._removeTooltip(e(this))}),n.removeData("ui-tooltip-open"),this._off(n,"mouseleave focusout keyup"),n[0]!==this.element[0]&&this._off(n,"remove"),this._off(this.document,"mousemove"),t&&"mouseleave"===t.type&&e.each(this.parents,function(t,i){e(i.element).attr("title",i.title),delete s.parents[t]}),a.closing=!0,this._trigger("close",t,{tooltip:i}),a.hiding||(a.closing=!1)),void 0):(n.removeData("ui-tooltip-open"),void 0)},_tooltip:function(t){var i=e("
    ").attr("role","tooltip").addClass("ui-tooltip ui-widget ui-corner-all ui-widget-content "+(this.options.tooltipClass||"")),s=i.uniqueId().attr("id");return e("
    ").addClass("ui-tooltip-content").appendTo(i),i.appendTo(this.document[0].body),this.tooltips[s]={element:t,tooltip:i}},_find:function(e){var t=e.data("ui-tooltip-id");return t?this.tooltips[t]:null},_removeTooltip:function(e){e.remove(),delete this.tooltips[e.attr("id")]},_destroy:function(){var t=this;e.each(this.tooltips,function(i,s){var n=e.Event("blur"),a=s.element;n.target=n.currentTarget=a[0],t.close(n,!0),e("#"+i).remove(),a.data("ui-tooltip-title")&&(a.attr("title")||a.attr("title",a.data("ui-tooltip-title")),a.removeData("ui-tooltip-title"))}),this.liveRegion.remove()}})}); diff --git a/qt/aqt/data/web/js/vendor/jquery.js b/qt/aqt/data/web/js/vendor/jquery.js deleted file mode 100644 index e83647587..000000000 --- a/qt/aqt/data/web/js/vendor/jquery.js +++ /dev/null @@ -1,5 +0,0 @@ -/*! jQuery v1.12.4 | (c) jQuery Foundation | jquery.org/license */ -!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="1.12.4",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return e.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a){return n.each(this,a)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(e.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:g,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&&n.isArray(a)?a:[]):f=a&&n.isPlainObject(a)?a:{},g[d]=n.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){var b=a&&a.toString();return!n.isArray(a)&&b-parseFloat(b)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!k.call(a,"constructor")&&!k.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(!l.ownFirst)for(b in a)return k.call(a,b);for(b in a);return void 0===b||k.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?i[j.call(a)]||"object":typeof a},globalEval:function(b){b&&n.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):g.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(h)return h.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&&h.push(e);else for(g in a)e=b(a[g],g,c),null!=e&&h.push(e);return f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=e.call(arguments,2),d=function(){return a.apply(b||this,c.concat(e.call(arguments)))},d.guid=a.guid=a.guid||n.guid++,d):void 0},now:function(){return+new Date},support:l}),"function"==typeof Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){i["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=!!a&&"length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ga(),z=ga(),A=ga(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+M+"))|)"+L+"*\\]",O=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+N+")*)|.*)\\)|)",P=new RegExp(L+"+","g"),Q=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),R=new RegExp("^"+L+"*,"+L+"*"),S=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),T=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),U=new RegExp(O),V=new RegExp("^"+M+"$"),W={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M+"|[*])"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},X=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Z=/^[^{]+\{\s*\[native \w/,$=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,_=/[+~]/,aa=/'|\\/g,ba=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),ca=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},da=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(ea){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fa(a,b,d,e){var f,h,j,k,l,o,r,s,w=b&&b.ownerDocument,x=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==x&&9!==x&&11!==x)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==x&&(o=$.exec(a)))if(f=o[1]){if(9===x){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(w&&(j=w.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(o[2])return H.apply(d,b.getElementsByTagName(a)),d;if((f=o[3])&&c.getElementsByClassName&&b.getElementsByClassName)return H.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==x)w=b,s=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(aa,"\\$&"):b.setAttribute("id",k=u),r=g(a),h=r.length,l=V.test(k)?"#"+k:"[id='"+k+"']";while(h--)r[h]=l+" "+qa(r[h]);s=r.join(","),w=_.test(a)&&oa(b.parentNode)||b}if(s)try{return H.apply(d,w.querySelectorAll(s)),d}catch(y){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(Q,"$1"),b,d,e)}function ga(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ha(a){return a[u]=!0,a}function ia(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ja(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function ka(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function la(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function na(a){return ha(function(b){return b=+b,ha(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function oa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=fa.support={},f=fa.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fa.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ia(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ia(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Z.test(n.getElementsByClassName),c.getById=ia(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return"undefined"!=typeof b.getElementsByClassName&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=Z.test(n.querySelectorAll))&&(ia(function(a){o.appendChild(a).innerHTML="",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ia(function(a){var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Z.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ia(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",O)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Z.test(o.compareDocumentPosition),t=b||Z.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return ka(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?ka(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},fa.matches=function(a,b){return fa(a,null,null,b)},fa.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(T,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fa(b,n,null,[a]).length>0},fa.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fa.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fa.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fa.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fa.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fa.selectors={cacheLength:50,createPseudo:ha,match:W,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ba,ca),a[3]=(a[3]||a[4]||a[5]||"").replace(ba,ca),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fa.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fa.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return W.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&U.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ba,ca).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fa.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(P," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fa.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ha(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ha(function(a){var b=[],c=[],d=h(a.replace(Q,"$1"));return d[u]?ha(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ha(function(a){return function(b){return fa(a,b).length>0}}),contains:ha(function(a){return a=a.replace(ba,ca),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ha(function(a){return V.test(a||"")||fa.error("unsupported lang: "+a),a=a.replace(ba,ca).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Y.test(a.nodeName)},input:function(a){return X.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:na(function(){return[0]}),last:na(function(a,b){return[b-1]}),eq:na(function(a,b,c){return[0>c?c+b:c]}),even:na(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:na(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:na(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:na(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function ra(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j,k=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(j=b[u]||(b[u]={}),i=j[b.uniqueID]||(j[b.uniqueID]={}),(h=i[d])&&h[0]===w&&h[1]===f)return k[2]=h[2];if(i[d]=k,k[2]=a(b,c,g))return!0}}}function sa(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ta(a,b,c){for(var d=0,e=b.length;e>d;d++)fa(a,b[d],c);return c}function ua(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function va(a,b,c,d,e,f){return d&&!d[u]&&(d=va(d)),e&&!e[u]&&(e=va(e,f)),ha(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ta(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ua(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ua(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ua(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function wa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ra(function(a){return a===b},h,!0),l=ra(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[ra(sa(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return va(i>1&&sa(m),i>1&&qa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(Q,"$1"),c,e>i&&wa(a.slice(i,e)),f>e&&wa(a=a.slice(e)),f>e&&qa(a))}m.push(c)}return sa(m)}function xa(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=F.call(i));u=ua(u)}H.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&fa.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ha(f):f}return h=fa.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xa(e,d)),f.selector=a}return f},i=fa.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ba,ca),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=W.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ba,ca),_.test(j[0].type)&&oa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qa(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||_.test(a)&&oa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ia(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ia(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||ja("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ia(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ja("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ia(function(a){return null==a.getAttribute("disabled")})||ja(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fa}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.uniqueSort=n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},v=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},w=n.expr.match.needsContext,x=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,y=/^.[^:#\[\.,]*$/;function z(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(y.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return n.inArray(a,b)>-1!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;e>b;b++)if(n.contains(d[b],this))return!0}));for(b=0;e>b;b++)n.find(a,d[b],c);return c=this.pushStack(e>1?n.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(z(this,a||[],!1))},not:function(a){return this.pushStack(z(this,a||[],!0))},is:function(a){return!!z(this,"string"==typeof a&&w.test(a)?n(a):a||[],!1).length}});var A,B=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=n.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||A,"string"==typeof a){if(e="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:B.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),x.test(e[1])&&n.isPlainObject(b))for(e in b)n.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}if(f=d.getElementById(e[2]),f&&f.parentNode){if(f.id!==e[2])return A.find(a);this.length=1,this[0]=f}return this.context=d,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof c.ready?c.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};C.prototype=n.fn,A=n(d);var D=/^(?:parents|prev(?:Until|All))/,E={children:!0,contents:!0,next:!0,prev:!0};n.fn.extend({has:function(a){var b,c=n(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(n.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=w.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?n.inArray(this[0],n(a)):n.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.uniqueSort(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function F(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return u(a,"parentNode")},parentsUntil:function(a,b,c){return u(a,"parentNode",c)},next:function(a){return F(a,"nextSibling")},prev:function(a){return F(a,"previousSibling")},nextAll:function(a){return u(a,"nextSibling")},prevAll:function(a){return u(a,"previousSibling")},nextUntil:function(a,b,c){return u(a,"nextSibling",c)},prevUntil:function(a,b,c){return u(a,"previousSibling",c)},siblings:function(a){return v((a.parentNode||{}).firstChild,a)},children:function(a){return v(a.firstChild)},contents:function(a){return n.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(E[a]||(e=n.uniqueSort(e)),D.test(a)&&(e=e.reverse())),this.pushStack(e)}});var G=/\S+/g;function H(a){var b={};return n.each(a.match(G)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?H(a):n.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h-1)f.splice(c,1),h>=c&&h--}),this},has:function(a){return a?n.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=!0,c||j.disable(),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().progress(c.notify).done(c.resolve).fail(c.reject):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=e.call(arguments),d=c.length,f=1!==d||a&&n.isFunction(a.promise)?d:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?e.call(arguments):d,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(d>1)for(i=new Array(d),j=new Array(d),k=new Array(d);d>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().progress(h(b,j,i)).done(h(b,k,c)).fail(g.reject):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(d,[n]),n.fn.triggerHandler&&(n(d).triggerHandler("ready"),n(d).off("ready"))))}});function J(){d.addEventListener?(d.removeEventListener("DOMContentLoaded",K),a.removeEventListener("load",K)):(d.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(d.addEventListener||"load"===a.event.type||"complete"===d.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll)a.setTimeout(n.ready);else if(d.addEventListener)d.addEventListener("DOMContentLoaded",K),a.addEventListener("load",K);else{d.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&d.documentElement}catch(e){}c&&c.doScroll&&!function f(){if(!n.isReady){try{c.doScroll("left")}catch(b){return a.setTimeout(f,50)}J(),n.ready()}}()}return I.promise(b)},n.ready.promise();var L;for(L in n(l))break;l.ownFirst="0"===L,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c,e;c=d.getElementsByTagName("body")[0],c&&c.style&&(b=d.createElement("div"),e=d.createElement("div"),e.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(e).appendChild(b),"undefined"!=typeof b.style.zoom&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",l.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(e))}),function(){var a=d.createElement("div");l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}a=null}();var M=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b},N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0; -}return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function R(a,b,d,e){if(M(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),"object"!=typeof b&&"function"!=typeof b||(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[n.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[n.camelCase(b)])):f=g,f}}function S(a,b,c){if(M(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=void 0)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?n.cache[a[n.expando]]:a[n.expando],!!a&&!Q(a)},data:function(a,b,c){return R(a,b,c)},removeData:function(a,b){return S(a,b)},_data:function(a,b,c){return R(a,b,c,!0)},_removeData:function(a,b){return S(a,b,!0)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=n.data(f),1===f.nodeType&&!n._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));n._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){n.data(this,a)}):arguments.length>1?this.each(function(){n.data(this,a,b)}):f?P(f,a,n.data(f,a)):void 0},removeData:function(a){return this.each(function(){n.removeData(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=n._data(a,b),c&&(!d||n.isArray(c)?d=n._data(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return n._data(a,c)||n._data(a,c,{empty:n.Callbacks("once memory").add(function(){n._removeData(a,b+"queue"),n._removeData(a,c)})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthh;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},Z=/^(?:checkbox|radio)$/i,$=/<([\w:-]+)/,_=/^$|\/(?:java|ecma)script/i,aa=/^\s+/,ba="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";function ca(a){var b=ba.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}!function(){var a=d.createElement("div"),b=d.createDocumentFragment(),c=d.createElement("input");a.innerHTML="
    a",l.leadingWhitespace=3===a.firstChild.nodeType,l.tbody=!a.getElementsByTagName("tbody").length,l.htmlSerialize=!!a.getElementsByTagName("link").length,l.html5Clone="<:nav>"!==d.createElement("nav").cloneNode(!0).outerHTML,c.type="checkbox",c.checked=!0,b.appendChild(c),l.appendChecked=c.checked,a.innerHTML="",l.noCloneChecked=!!a.cloneNode(!0).lastChild.defaultValue,b.appendChild(a),c=d.createElement("input"),c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),a.appendChild(c),l.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,l.noCloneEvent=!!a.addEventListener,a[n.expando]=1,l.attributes=!a.getAttribute(n.expando)}();var da={option:[1,""],legend:[1,"
    ","
    "],area:[1,"",""],param:[1,"",""],thead:[1,"","
    "],tr:[2,"","
    "],col:[2,"","
    "],td:[3,"","
    "],_default:l.htmlSerialize?[0,"",""]:[1,"X
    ","
    "]};da.optgroup=da.option,da.tbody=da.tfoot=da.colgroup=da.caption=da.thead,da.th=da.td;function ea(a,b){var c,d,e=0,f="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,ea(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function fa(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}var ga=/<|&#?\w+;/,ha=/r;r++)if(g=a[r],g||0===g)if("object"===n.type(g))n.merge(q,g.nodeType?[g]:g);else if(ga.test(g)){i=i||p.appendChild(b.createElement("div")),j=($.exec(g)||["",""])[1].toLowerCase(),m=da[j]||da._default,i.innerHTML=m[1]+n.htmlPrefilter(g)+m[2],f=m[0];while(f--)i=i.lastChild;if(!l.leadingWhitespace&&aa.test(g)&&q.push(b.createTextNode(aa.exec(g)[0])),!l.tbody){g="table"!==j||ha.test(g)?""!==m[1]||ha.test(g)?0:i:i.firstChild,f=g&&g.childNodes.length;while(f--)n.nodeName(k=g.childNodes[f],"tbody")&&!k.childNodes.length&&g.removeChild(k)}n.merge(q,i.childNodes),i.textContent="";while(i.firstChild)i.removeChild(i.firstChild);i=p.lastChild}else q.push(b.createTextNode(g));i&&p.removeChild(i),l.appendChecked||n.grep(ea(q,"input"),ia),r=0;while(g=q[r++])if(d&&n.inArray(g,d)>-1)e&&e.push(g);else if(h=n.contains(g.ownerDocument,g),i=ea(p.appendChild(g),"script"),h&&fa(i),c){f=0;while(g=i[f++])_.test(g.type||"")&&c.push(g)}return i=null,p}!function(){var b,c,e=d.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b]=c in a)||(e.setAttribute(c,"t"),l[b]=e.attributes[c].expando===!1);e=null}();var ka=/^(?:input|select|textarea)$/i,la=/^key/,ma=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,na=/^(?:focusinfocus|focusoutblur)$/,oa=/^([^.]*)(?:\.(.+)|)/;function pa(){return!0}function qa(){return!1}function ra(){try{return d.activeElement}catch(a){}}function sa(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)sa(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=qa;else if(!e)return a;return 1===f&&(g=e,e=function(a){return n().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=n.guid++)),a.each(function(){n.event.add(this,b,e,d,c)})}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return"undefined"==typeof n||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(G)||[""],h=b.length;while(h--)f=oa.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(G)||[""],j=b.length;while(j--)if(h=oa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,e,f){var g,h,i,j,l,m,o,p=[e||d],q=k.call(b,"type")?b.type:b,r=k.call(b,"namespace")?b.namespace.split("."):[];if(i=m=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!na.test(q+n.event.triggered)&&(q.indexOf(".")>-1&&(r=q.split("."),q=r.shift(),r.sort()),h=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=r.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:n.makeArray(c,[b]),l=n.event.special[q]||{},f||!l.trigger||l.trigger.apply(e,c)!==!1)){if(!f&&!l.noBubble&&!n.isWindow(e)){for(j=l.delegateType||q,na.test(j+q)||(i=i.parentNode);i;i=i.parentNode)p.push(i),m=i;m===(e.ownerDocument||d)&&p.push(m.defaultView||m.parentWindow||a)}o=0;while((i=p[o++])&&!b.isPropagationStopped())b.type=o>1?j:l.bindType||q,g=(n._data(i,"events")||{})[b.type]&&n._data(i,"handle"),g&&g.apply(i,c),g=h&&i[h],g&&g.apply&&M(i)&&(b.result=g.apply(i,c),b.result===!1&&b.preventDefault());if(b.type=q,!f&&!b.isDefaultPrevented()&&(!l._default||l._default.apply(p.pop(),c)===!1)&&M(e)&&h&&e[q]&&!n.isWindow(e)){m=e[h],m&&(e[h]=null),n.event.triggered=q;try{e[q]()}catch(s){}n.event.triggered=void 0,m&&(e[h]=m)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,d,f,g,h=[],i=e.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())a.rnamespace&&!a.rnamespace.test(g.namespace)||(a.handleObj=g,a.data=g.data,d=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==d&&(a.result=d)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>-1:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h]","i"),va=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,wa=/\s*$/g,Aa=ca(d),Ba=Aa.appendChild(d.createElement("div"));function Ca(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function Da(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function Ea(a){var b=ya.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Fa(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Ga(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(Da(b).text=a.text,Ea(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&Z.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}}function Ha(a,b,c,d){b=f.apply([],b);var e,g,h,i,j,k,m=0,o=a.length,p=o-1,q=b[0],r=n.isFunction(q);if(r||o>1&&"string"==typeof q&&!l.checkClone&&xa.test(q))return a.each(function(e){var f=a.eq(e);r&&(b[0]=q.call(this,e,f.html())),Ha(f,b,c,d)});if(o&&(k=ja(b,a[0].ownerDocument,!1,a,d),e=k.firstChild,1===k.childNodes.length&&(k=e),e||d)){for(i=n.map(ea(k,"script"),Da),h=i.length;o>m;m++)g=k,m!==p&&(g=n.clone(g,!0,!0),h&&n.merge(i,ea(g,"script"))),c.call(a[m],g,m);if(h)for(j=i[i.length-1].ownerDocument,n.map(i,Ea),m=0;h>m;m++)g=i[m],_.test(g.type||"")&&!n._data(g,"globalEval")&&n.contains(j,g)&&(g.src?n._evalUrl&&n._evalUrl(g.src):n.globalEval((g.text||g.textContent||g.innerHTML||"").replace(za,"")));k=e=null}return a}function Ia(a,b,c){for(var d,e=b?n.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||n.cleanData(ea(d)),d.parentNode&&(c&&n.contains(d.ownerDocument,d)&&fa(ea(d,"script")),d.parentNode.removeChild(d));return a}n.extend({htmlPrefilter:function(a){return a.replace(va,"<$1>")},clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!ua.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(Ba.innerHTML=a.outerHTML,Ba.removeChild(f=Ba.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=ea(f),h=ea(a),g=0;null!=(e=h[g]);++g)d[g]&&Ga(e,d[g]);if(b)if(c)for(h=h||ea(a),d=d||ea(f),g=0;null!=(e=h[g]);g++)Fa(e,d[g]);else Fa(a,f);return d=ea(f,"script"),d.length>0&&fa(d,!i&&ea(a,"script")),d=h=e=null,f},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.attributes,m=n.event.special;null!=(d=a[h]);h++)if((b||M(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k||"undefined"==typeof d.removeAttribute?d[i]=void 0:d.removeAttribute(i),c.push(f))}}}),n.fn.extend({domManip:Ha,detach:function(a){return Ia(this,a,!0)},remove:function(a){return Ia(this,a)},text:function(a){return Y(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||d).createTextNode(a))},null,a,arguments.length)},append:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.appendChild(a)}})},prepend:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(ea(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return Y(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(ta,""):void 0;if("string"==typeof a&&!wa.test(a)&&(l.htmlSerialize||!ua.test(a))&&(l.leadingWhitespace||!aa.test(a))&&!da[($.exec(a)||["",""])[1].toLowerCase()]){a=n.htmlPrefilter(a);try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ea(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ha(this,arguments,function(b){var c=this.parentNode;n.inArray(this,a)<0&&(n.cleanData(ea(this)),c&&c.replaceChild(b,this))},a)}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],f=n(a),h=f.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(f[d])[b](c),g.apply(e,c.get());return this.pushStack(e)}});var Ja,Ka={HTML:"block",BODY:"block"};function La(a,b){var c=n(b.createElement(a)).appendTo(b.body),d=n.css(c[0],"display");return c.detach(),d}function Ma(a){var b=d,c=Ka[a];return c||(c=La(a,b),"none"!==c&&c||(Ja=(Ja||n("