updated core to 8.52

changed field upload limits
mignified assets for prod
2018-04-23 21:33:41 +02:00 · 2018-04-23 21:29:31 +02:00 · 2018-04-23 21:27:29 +02:00 · 2018-04-23 20:38:32 +02:00 · 2018-04-23 16:56:46 +02:00 · 2018-04-21 10:28:09 +02:00
99 changed files with 1796 additions and 8729 deletions
@@ -554,16 +554,16 @@
        },
        {
            "name": "consolidation/robo",
-            "version": "1.2.2",
+            "version": "1.2.3",
            "source": {
                "type": "git",
                "url": "https://github.com/consolidation/Robo.git",
-                "reference": "9ef2724f72feb017517a755564516dbde99e15e4"
+                "reference": "54a13e268917b92576d75e10dca8227b95a574d9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/Robo/zipball/9ef2724f72feb017517a755564516dbde99e15e4",
+                "url": "https://api.github.com/repos/consolidation/Robo/zipball/54a13e268917b92576d75e10dca8227b95a574d9",
-                "reference": "9ef2724f72feb017517a755564516dbde99e15e4",
+                "reference": "54a13e268917b92576d75e10dca8227b95a574d9",
                "shasum": ""
            },
            "require": {
@@ -587,9 +587,11 @@
                "codeception/aspect-mock": "^1|^2.1.1",
                "codeception/base": "^2.3.7",
                "codeception/verify": "^0.3.2",
                "g-1-a/composer-test-scenarios": "^2",
                "goaop/framework": "~2.1.2",
-                "greg-1-anderson/composer-test-scenarios": "^1",
+                "goaop/parser-reflection": "^1.1.0",
                "natxet/cssmin": "3.0.4",
                "nikic/php-parser": "^3.1.5",
                "patchwork/jsqueeze": "~2",
                "pear/archive_tar": "^1.4.2",
                "phpunit/php-code-coverage": "~2|~4",
@@ -628,7 +630,7 @@
                }
            ],
            "description": "Modern task runner",
-            "time": "2018-02-28T01:03:54+00:00"
+            "time": "2018-04-06T05:27:37+00:00"
        },
        {
            "name": "container-interop/container-interop",
@@ -1522,16 +1524,16 @@
        },
        {
            "name": "drupal/core",
-            "version": "8.5.1",
+            "version": "8.5.2",
            "source": {
                "type": "git",
                "url": "https://github.com/drupal/core.git",
-                "reference": "2aeca7dfa2661296602ac16bf9fd6085f0a121be"
+                "reference": "bc21760d4be4ad117851809183c8d18880ab275a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core/zipball/2aeca7dfa2661296602ac16bf9fd6085f0a121be",
+                "url": "https://api.github.com/repos/drupal/core/zipball/bc21760d4be4ad117851809183c8d18880ab275a",
-                "reference": "2aeca7dfa2661296602ac16bf9fd6085f0a121be",
+                "reference": "bc21760d4be4ad117851809183c8d18880ab275a",
                "shasum": ""
            },
            "require": {
@@ -1753,7 +1755,7 @@
                "GPL-2.0-or-later"
            ],
            "description": "Drupal is an open source content management platform powering millions of websites and applications.",
-            "time": "2018-03-27T09:58:42+00:00"
+            "time": "2018-04-18T17:00:56+00:00"
        },
        {
            "name": "drush/drush",
@@ -2067,16 +2069,16 @@
        },
        {
            "name": "guzzlehttp/guzzle",
-            "version": "6.3.2",
+            "version": "6.3.3",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "68d0ea14d5a3f42a20e87632a5f84931e2709c90"
+                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/68d0ea14d5a3f42a20e87632a5f84931e2709c90",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
-                "reference": "68d0ea14d5a3f42a20e87632a5f84931e2709c90",
+                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
                "shasum": ""
            },
            "require": {
@@ -2086,7 +2088,7 @@
            },
            "require-dev": {
                "ext-curl": "*",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
                "psr/log": "^1.0"
            },
            "suggest": {
@@ -2128,7 +2130,7 @@
                "rest",
                "web service"
            ],
-            "time": "2018-03-26T16:33:04+00:00"
+            "time": "2018-04-22T15:46:56+00:00"
        },
        {
            "name": "guzzlehttp/promises",
@@ -2465,24 +2467,24 @@
        },
        {
            "name": "nikic/php-parser",
-            "version": "v3.1.5",
+            "version": "v4.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce"
+                "reference": "e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bb87e28e7d7b8d9a7fda231d37457c9210faf6ce",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3",
-                "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce",
+                "reference": "e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3",
                "shasum": ""
            },
            "require": {
                "ext-tokenizer": "*",
-                "php": ">=5.5"
+                "php": ">=7.0"
            },
            "require-dev": {
-                "phpunit/phpunit": "~4.0|~5.0"
+                "phpunit/phpunit": "^6.5 || ^7.0"
            },
            "bin": [
                "bin/php-parse"
@@ -2490,7 +2492,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "4.0-dev"
                }
            },
            "autoload": {
@@ -2512,20 +2514,20 @@
                "parser",
                "php"
            ],
-            "time": "2018-02-28T20:30:58+00:00"
+            "time": "2018-03-25T17:35:16+00:00"
        },
        {
            "name": "paragonie/random_compat",
-            "version": "v2.0.11",
+            "version": "v2.0.12",
            "source": {
                "type": "git",
                "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8"
+                "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/5da4d3c796c275c55f057af5a643ae297d96b4d8",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
-                "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8",
+                "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
                "shasum": ""
            },
            "require": {
@@ -2560,7 +2562,7 @@
                "pseudorandom",
                "random"
            ],
-            "time": "2017-09-27T21:40:39+00:00"
+            "time": "2018-04-04T21:24:14+00:00"
        },
        {
            "name": "psr/container",
@@ -2710,29 +2712,29 @@
        },
        {
            "name": "psy/psysh",
-            "version": "v0.8.18",
+            "version": "v0.9.3",
            "source": {
                "type": "git",
                "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "5357b1cffc8fb375d6a9e3c86d5c82dd38a40834"
+                "reference": "79c280013cf0b30fa23f3ba8bd3649218075adf4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/5357b1cffc8fb375d6a9e3c86d5c82dd38a40834",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/79c280013cf0b30fa23f3ba8bd3649218075adf4",
-                "reference": "5357b1cffc8fb375d6a9e3c86d5c82dd38a40834",
+                "reference": "79c280013cf0b30fa23f3ba8bd3649218075adf4",
                "shasum": ""
            },
            "require": {
                "dnoegel/php-xdg-base-dir": "0.1",
                "jakub-onderka/php-console-highlighter": "0.3.*",
-                "nikic/php-parser": "~1.3|~2.0|~3.0",
+                "nikic/php-parser": "~1.3|~2.0|~3.0|~4.0",
-                "php": ">=5.3.9",
+                "php": ">=5.4.0",
                "symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0",
                "symfony/var-dumper": "~2.7|~3.0|~4.0"
            },
            "require-dev": {
-                "hoa/console": "~3.16|~1.14",
+                "hoa/console": "~2.15|~3.16",
-                "phpunit/phpunit": "^4.8.35|^5.4.3",
+                "phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0",
                "symfony/finder": "~2.1|~3.0|~4.0"
            },
            "suggest": {
@@ -2748,15 +2750,15 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-develop": "0.8.x-dev"
+                    "dev-develop": "0.9.x-dev"
                }
            },
            "autoload": {
                "files": [
-                    "src/Psy/functions.php"
+                    "src/functions.php"
                ],
                "psr-4": {
-                    "Psy\\": "src/Psy/"
+                    "Psy\\": "src/"
                }
            },
            "notification-url": "https://packagist.org/downloads/",
@@ -2778,7 +2780,7 @@
                "interactive",
                "shell"
            ],
-            "time": "2018-04-02T05:41:44+00:00"
+            "time": "2018-04-18T12:32:50+00:00"
        },
        {
            "name": "sebastian/version",
@@ -2978,7 +2980,7 @@
        },
        {
            "name": "symfony/class-loader",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/class-loader.git",
@@ -3034,7 +3036,7 @@
        },
        {
            "name": "symfony/config",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/config.git",
@@ -3097,7 +3099,7 @@
        },
        {
            "name": "symfony/console",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
@@ -3166,7 +3168,7 @@
        },
        {
            "name": "symfony/css-selector",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/css-selector.git",
@@ -3219,7 +3221,7 @@
        },
        {
            "name": "symfony/debug",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/debug.git",
@@ -3275,7 +3277,7 @@
        },
        {
            "name": "symfony/dependency-injection",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/dependency-injection.git",
@@ -3346,7 +3348,7 @@
        },
        {
            "name": "symfony/dom-crawler",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/dom-crawler.git",
@@ -3402,16 +3404,16 @@
        },
        {
            "name": "symfony/event-dispatcher",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "58990682ac3fdc1f563b7e705452921372aad11d"
+                "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/58990682ac3fdc1f563b7e705452921372aad11d",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/fdd5abcebd1061ec647089c6c41a07ed60af09f8",
-                "reference": "58990682ac3fdc1f563b7e705452921372aad11d",
+                "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8",
                "shasum": ""
            },
            "require": {
@@ -3461,11 +3463,11 @@
            ],
            "description": "Symfony EventDispatcher Component",
            "homepage": "https://symfony.com",
-            "time": "2018-02-14T10:03:57+00:00"
+            "time": "2018-04-06T07:35:25+00:00"
        },
        {
            "name": "symfony/filesystem",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/filesystem.git",
@@ -3514,16 +3516,16 @@
        },
        {
            "name": "symfony/finder",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/finder.git",
-                "reference": "7a2e1299cc0c4162996f18e347b6356729a55317"
+                "reference": "bd14efe8b1fabc4de82bf50dce62f05f9a102433"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/7a2e1299cc0c4162996f18e347b6356729a55317",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/bd14efe8b1fabc4de82bf50dce62f05f9a102433",
-                "reference": "7a2e1299cc0c4162996f18e347b6356729a55317",
+                "reference": "bd14efe8b1fabc4de82bf50dce62f05f9a102433",
                "shasum": ""
            },
            "require": {
@@ -3559,11 +3561,11 @@
            ],
            "description": "Symfony Finder Component",
            "homepage": "https://symfony.com",
-            "time": "2018-03-28T18:23:39+00:00"
+            "time": "2018-04-04T05:07:11+00:00"
        },
        {
            "name": "symfony/http-foundation",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-foundation.git",
@@ -3617,16 +3619,16 @@
        },
        {
            "name": "symfony/http-kernel",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "43cfdad2ca1dba608662db0699c1bbb715d08191"
+                "reference": "3cc2d4374aa9590c09277ad68657671cf49dbbf4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/43cfdad2ca1dba608662db0699c1bbb715d08191",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3cc2d4374aa9590c09277ad68657671cf49dbbf4",
-                "reference": "43cfdad2ca1dba608662db0699c1bbb715d08191",
+                "reference": "3cc2d4374aa9590c09277ad68657671cf49dbbf4",
                "shasum": ""
            },
            "require": {
@@ -3701,7 +3703,7 @@
            ],
            "description": "Symfony HttpKernel Component",
            "homepage": "https://symfony.com",
-            "time": "2018-04-03T05:49:44+00:00"
+            "time": "2018-04-06T15:19:48+00:00"
        },
        {
            "name": "symfony/polyfill-iconv",
@@ -3882,7 +3884,7 @@
        },
        {
            "name": "symfony/process",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/process.git",
@@ -3991,16 +3993,16 @@
        },
        {
            "name": "symfony/routing",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/routing.git",
-                "reference": "5f90733adbf19ea71468a5761fb8f5a043d424dd"
+                "reference": "50f333b707bef9f6972ad04e6df3ec8875c9a67c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/5f90733adbf19ea71468a5761fb8f5a043d424dd",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/50f333b707bef9f6972ad04e6df3ec8875c9a67c",
-                "reference": "5f90733adbf19ea71468a5761fb8f5a043d424dd",
+                "reference": "50f333b707bef9f6972ad04e6df3ec8875c9a67c",
                "shasum": ""
            },
            "require": {
@@ -4065,11 +4067,11 @@
                "uri",
                "url"
            ],
-            "time": "2018-03-23T08:14:09+00:00"
+            "time": "2018-04-04T13:22:16+00:00"
        },
        {
            "name": "symfony/serializer",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/serializer.git",
@@ -4147,7 +4149,7 @@
        },
        {
            "name": "symfony/translation",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/translation.git",
@@ -4215,16 +4217,16 @@
        },
        {
            "name": "symfony/validator",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/validator.git",
-                "reference": "4342b66102171b417776f0e4f8f00b20a1eddb0f"
+                "reference": "6fa41262dcbd50eedb1e841cfd97f5a1956cf2e7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/validator/zipball/4342b66102171b417776f0e4f8f00b20a1eddb0f",
+                "url": "https://api.github.com/repos/symfony/validator/zipball/6fa41262dcbd50eedb1e841cfd97f5a1956cf2e7",
-                "reference": "4342b66102171b417776f0e4f8f00b20a1eddb0f",
+                "reference": "6fa41262dcbd50eedb1e841cfd97f5a1956cf2e7",
                "shasum": ""
            },
            "require": {
@@ -4295,20 +4297,20 @@
            ],
            "description": "Symfony Validator Component",
            "homepage": "https://symfony.com",
-            "time": "2018-04-02T09:38:44+00:00"
+            "time": "2018-04-06T07:35:25+00:00"
        },
        {
            "name": "symfony/var-dumper",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "6f502127b1bb85f7f30f8bc1fb60570a10431863"
+                "reference": "951643091b39a6fd40fce56cd16e21e12bef3feb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6f502127b1bb85f7f30f8bc1fb60570a10431863",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/951643091b39a6fd40fce56cd16e21e12bef3feb",
-                "reference": "6f502127b1bb85f7f30f8bc1fb60570a10431863",
+                "reference": "951643091b39a6fd40fce56cd16e21e12bef3feb",
                "shasum": ""
            },
            "require": {
@@ -4364,11 +4366,11 @@
                "debug",
                "dump"
            ],
-            "time": "2018-04-03T05:22:50+00:00"
+            "time": "2018-04-03T20:34:11+00:00"
        },
        {
            "name": "symfony/yaml",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/yaml.git",
@@ -4830,16 +4832,16 @@
        },
        {
            "name": "zendframework/zend-stdlib",
-            "version": "3.1.0",
+            "version": "3.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/zendframework/zend-stdlib.git",
-                "reference": "debedcfc373a293f9250cc9aa03cf121428c8e78"
+                "reference": "10ef03144902d1955f935fff5346ed52f7d99bcc"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/debedcfc373a293f9250cc9aa03cf121428c8e78",
+                "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/10ef03144902d1955f935fff5346ed52f7d99bcc",
-                "reference": "debedcfc373a293f9250cc9aa03cf121428c8e78",
+                "reference": "10ef03144902d1955f935fff5346ed52f7d99bcc",
                "shasum": ""
            },
            "require": {
@@ -4848,7 +4850,7 @@
            "require-dev": {
                "athletic/athletic": "~0.1",
                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "^2.6.2"
+                "zendframework/zend-coding-standard": "~1.0.0"
            },
            "type": "library",
            "extra": {
@@ -4871,7 +4873,7 @@
                "stdlib",
                "zf2"
            ],
-            "time": "2016-09-13T14:38:50+00:00"
+            "time": "2018-04-12T16:05:42+00:00"
        }
    ],
    "packages-dev": [
@@ -5766,23 +5768,23 @@
        },
        {
            "name": "phpspec/prophecy",
-            "version": "1.7.5",
+            "version": "1.7.6",
            "source": {
                "type": "git",
                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401"
+                "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
-                "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401",
+                "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
                "shasum": ""
            },
            "require": {
                "doctrine/instantiator": "^1.0.2",
                "php": "^5.3|^7.0",
                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
-                "sebastian/comparator": "^1.1|^2.0",
+                "sebastian/comparator": "^1.1|^2.0|^3.0",
                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
            },
            "require-dev": {
@@ -5825,20 +5827,20 @@
                "spy",
                "stub"
            ],
-            "time": "2018-02-19T10:16:54+00:00"
+            "time": "2018-04-18T13:57:24+00:00"
        },
        {
            "name": "phpunit/php-code-coverage",
-            "version": "5.3.0",
+            "version": "5.3.2",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1"
+                "reference": "c89677919c5dd6d3b3852f230a663118762218ac"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/661f34d0bd3f1a7225ef491a70a020ad23a057a1",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c89677919c5dd6d3b3852f230a663118762218ac",
-                "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1",
+                "reference": "c89677919c5dd6d3b3852f230a663118762218ac",
                "shasum": ""
            },
            "require": {
@@ -5888,7 +5890,7 @@
                "testing",
                "xunit"
            ],
-            "time": "2017-12-06T09:29:45+00:00"
+            "time": "2018-04-06T15:36:58+00:00"
        },
        {
            "name": "phpunit/php-file-iterator",
@@ -6078,16 +6080,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "6.5.7",
+            "version": "6.5.8",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "6bd77b57707c236833d2b57b968e403df060c9d9"
+                "reference": "4f21a3c6b97c42952fd5c2837bb354ec0199b97b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6bd77b57707c236833d2b57b968e403df060c9d9",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4f21a3c6b97c42952fd5c2837bb354ec0199b97b",
-                "reference": "6bd77b57707c236833d2b57b968e403df060c9d9",
+                "reference": "4f21a3c6b97c42952fd5c2837bb354ec0199b97b",
                "shasum": ""
            },
            "require": {
@@ -6158,7 +6160,7 @@
                "testing",
                "xunit"
            ],
-            "time": "2018-02-26T07:01:09+00:00"
+            "time": "2018-04-10T11:38:34+00:00"
        },
        {
            "name": "phpunit/phpunit-mock-objects",
@@ -6815,7 +6817,7 @@
        },
        {
            "name": "symfony/browser-kit",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/browser-kit.git",
@@ -6872,16 +6874,16 @@
        },
        {
            "name": "symfony/phpunit-bridge",
-            "version": "v3.4.7",
+            "version": "v3.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/phpunit-bridge.git",
-                "reference": "e4b72beb8961340764367a804f21044e83fc19a8"
+                "reference": "48c669ec1a2b0425d4a82c7ad4bce2f5b947b95e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/e4b72beb8961340764367a804f21044e83fc19a8",
+                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/48c669ec1a2b0425d4a82c7ad4bce2f5b947b95e",
-                "reference": "e4b72beb8961340764367a804f21044e83fc19a8",
+                "reference": "48c669ec1a2b0425d4a82c7ad4bce2f5b947b95e",
                "shasum": ""
            },
            "require": {
@@ -6934,7 +6936,7 @@
            ],
            "description": "Symfony PHPUnit Bridge",
            "homepage": "https://symfony.com",
-            "time": "2018-03-20T23:37:33+00:00"
+            "time": "2018-04-04T15:02:59+00:00"
        },
        {
            "name": "theseer/tokenizer",
@@ -24,7 +24,7 @@ classList:
 ckeditor:
  remote: https://github.com/ckeditor/ckeditor-dev
-  version: "4.8.0"
+  version: "4.8.0+2018-04-18-security-patch"
  license:
    name: GNU-GPL-2.0-or-later
    url: https://github.com/ckeditor/ckeditor-dev/blob/4.8.0/LICENSE.md
@@ -82,7 +82,7 @@ class Drupal {
  /**
   * The current system version.
   */
-  const VERSION = '8.5.1';
+  const VERSION = '8.5.2';
  /**
   * Core API compatibility.
@@ -176,7 +176,9 @@ class EdlpAjaxController extends ControllerBase {
      'rendered'=> $rendered,
    ];
-    // if content type page (productions) get the menu items and linked dates
+    // if content type page (productions) :
    // -- get the menu items and linked dates
    // -- get the linked documents for corpus map
    if($this->bundle == "page"){
      $menuLinkManager = \Drupal::service('plugin.manager.menu.link');
      $links = $menuLinkManager->loadLinksByRoute('entity.node.canonical', array('node' => $this->id), 'productions');
@@ -195,6 +197,15 @@ class EdlpAjaxController extends ControllerBase {
        }
      }
      $data['menu_parents'] = $menu_parents;
      // Documents liés
      $documents_lies = $this->entity->get('field_documents_lies')->getValue();
      if(count($documents_lies)){
        foreach ($documents_lies as $key => $field) {
          $data['documents_lies'][] = $field['target_id'];
        }
      }
    }
    // translations links
@@ -1,71 +1 @@
-canvas#corpus-map {
+canvas#corpus-map{position:absolute;-webkit-box-sizing:border-box;box-sizing:border-box;top:0;left:0;z-index:0}canvas#corpus-map.de-activated{background-color:#f4f4f4}div.node-popup{z-index:10;position:absolute;-webkit-box-sizing:content-box;box-sizing:content-box;width:300px;min-height:30px;top:60%;left:30%;pointer-events:none}div.node-popup .inner{padding:.6em;outline:red solid 1px;background-color:#fff}div.node-popup:before{content:"";position:absolute;width:60px;height:0;border-top:1px solid red}div.node-popup[pos=bottom-right]{-webkit-transform:translateY(42px) translateX(42px);transform:translateY(42px) translateX(42px)}div.node-popup[pos=bottom-right]:before{top:-1px;left:-61px;-webkit-transform-origin:bottom right;transform-origin:bottom right;-webkit-transform:rotateZ(45deg);transform:rotateZ(45deg)}div.node-popup[pos=bottom-left]{-webkit-transform:translateX(-100%) translateY(42px) translateX(-42px);transform:translateX(-100%) translateY(42px) translateX(-42px)}div.node-popup[pos=bottom-left]:before{top:calc(100% +1px);left:100%;-webkit-transform-origin:top left;transform-origin:top left;-webkit-transform:rotateZ(-45deg);transform:rotateZ(-45deg)}div.node-popup[pos=top-left]{-webkit-transform:translateY(-100%) translateX(-100%) translateY(-42px) translateX(-42px);transform:translateY(-100%) translateX(-100%) translateY(-42px) translateX(-42px)}div.node-popup[pos=top-left]:before{bottom:0;left:100%;-webkit-transform-origin:top left;transform-origin:top left;-webkit-transform:rotateZ(45deg);transform:rotateZ(45deg)}div.node-popup[pos=top-right]{-webkit-transform:translateY(-100%) translateY(-42px) translateX(42px);transform:translateY(-100%) translateY(-42px) translateX(42px)}div.node-popup[pos=top-right]:before{top:calc(100% + 1px);left:-61px;-webkit-transform-origin:top right;transform-origin:top right;-webkit-transform:rotateZ(-45deg);transform:rotateZ(-45deg)}
  position: absolute;
  -webkit-box-sizing: border-box;
  box-sizing: border-box;
  top: 0;
  left: 0;
  z-index: 0; }
  canvas#corpus-map.de-activated {
    background-color: #f4f4f4; }
 div.node-popup {
  z-index: 10;
  position: absolute;
  -webkit-box-sizing: content-box;
  box-sizing: content-box;
  width: 300px;
  min-height: 30px;
  pointer-events: none;
  top: 60%;
  left: 30%;
  pointer-events: none; }
  div.node-popup .inner {
    padding: 0.6em;
    outline: 1px solid red;
    background-color: white; }
  div.node-popup:before {
    content: "";
    position: absolute;
    width: 60px;
    height: 0;
    border-top: 1px solid red; }
  div.node-popup[pos="bottom-right"] {
    -webkit-transform: translateY(42px) translateX(42px);
    transform: translateY(42px) translateX(42px); }
    div.node-popup[pos="bottom-right"]:before {
      top: -1px;
      left: -61px;
      -webkit-transform-origin: bottom right;
      transform-origin: bottom right;
      -webkit-transform: rotateZ(45deg);
      transform: rotateZ(45deg); }
  div.node-popup[pos="bottom-left"] {
    -webkit-transform: translateX(-100%) translateY(42px) translateX(-42px);
    transform: translateX(-100%) translateY(42px) translateX(-42px); }
    div.node-popup[pos="bottom-left"]:before {
      top: calc(100% +1px);
      left: 100%;
      -webkit-transform-origin: top left;
      transform-origin: top left;
      -webkit-transform: rotateZ(-45deg);
      transform: rotateZ(-45deg); }
  div.node-popup[pos="top-left"] {
    -webkit-transform: translateY(-100%) translateX(-100%) translateY(-42px) translateX(-42px);
    transform: translateY(-100%) translateX(-100%) translateY(-42px) translateX(-42px); }
    div.node-popup[pos="top-left"]:before {
      bottom: 0;
      left: 100%;
      -webkit-transform-origin: top left;
      transform-origin: top left;
      -webkit-transform: rotateZ(45deg);
      transform: rotateZ(45deg); }
  div.node-popup[pos="top-right"] {
    -webkit-transform: translateY(-100%) translateY(-42px) translateX(42px);
    transform: translateY(-100%) translateY(-42px) translateX(42px); }
    div.node-popup[pos="top-right"]:before {
      top: calc(100% + 1px);
      left: -61px;
      -webkit-transform-origin: top right;
      transform-origin: top right;
      -webkit-transform: rotateZ(-45deg);
      transform: rotateZ(-45deg); }
@@ -29,11 +29,11 @@
      width:0,
      height:0,
      // 'margin_top':90, // with red border on head
-      // 'margin_top':75, // without red border on head
+      'margin_top':75, // without red border on head
-      'margin_top':0,
+      // 'margin_top':0,
      'margin_right':0,
-      // 'margin_bottom':65,
+      'margin_bottom':65,
-      'margin_bottom':0,
+      // 'margin_bottom':0,
      'margin_left':0
    };
    var _physics = new Physics();
@@ -47,6 +47,8 @@
    var _nodes_centered = [];
    var _nodes_centered_attractions = [];
    var _loaded = false;
    var _playlist = [];
    var _p_velocity_factor = 0.5;
@@ -63,15 +65,9 @@
    var _ecolors = _settings.colors;
    // Physics
    var _attracter;
-        // _repulser_top,
+
-        // _repulser_center,
+    var check_parts_colid_frq = 2;
-        // _repulser_bottom,
+    var check_parts_colid_tick = 1;
        // _scrambler_TL,
        // _scrambler_TR,
        // _scrambler_BR,
        // _scrambler_BL,
        // _scrambler_CL,
        // _scrambler_CR;
    //     ____      _ __
    //    /  _/___  (_) /______
@@ -106,14 +102,14 @@
      _canvas.height = _scene_props.height*_dpi;
      _ctx.scale(_dpi, _dpi);
-
+      if(_loaded){
      if(_nodes.length){
        for (var i = 0; i < _nodes.length; i++) {
          _nodes[i].onResizeCanvas();
        }
-        // move _attracter and _repulser to the center again
+        // move _attracter and _repulser to their right places again
        resizePhysics();
      }
    };
    //   ___
@@ -149,6 +145,7 @@
      initEvents();
      checkPreOpenedEntry();
      startAnime();
      _loaded = true;
    };
    //  ___ _           _
@@ -230,13 +227,14 @@
      this.e_color = 'e_col_'+this.entrees[Math.floor(Math.random(this.entrees.length))];
      // pre-rendering node virtual canvas
      this.canvas = document.createElement('canvas');
      this.canvas_ctx = this.canvas.getContext('2d');
-
+      this.line_width = 1;
-      this.line_width = 1.5;
+      this.w = this.r*2+this.line_width*2;
-      this.canvas_w = this.r*2+this.line_width*2;
+      this.w_2 = this.w/2;
-      this.canvas.width = this.canvas_w;
+      this.canvas.width = this.w;
-      this.canvas.height = this.canvas_w;
+      this.canvas.height = this.w;
      this.canvas_ctx.fillStyle = 'rgb(255,255,255)';
      this.canvas_ctx.lineWidth = this.line_width;
@@ -250,8 +248,6 @@
      this.aside = false;
      this.scrambling = false;
      // this.n_repulses = {};
      // prototypes
      if (typeof Node.initialized == "undefined") {
@@ -264,43 +260,42 @@
          this.ori_pos = {x:this.x,y:this.y};
          // TODO: don't forget to move ori_pos on window resize
-          this.draw();
+          //this.drawSprite();
          this.initPhysics();
        };
-        Node.prototype.draw = function(){
+        // Node.prototype.drawSprite = function(){
-          _ctx.clearRect(0, 0, this.canvas_w, this.canvas_w);
+        //   _ctx.clearRect(0, 0, this.w, this.w);
-
+        //
-          this.canvas_ctx.beginPath();
+        //   this.canvas_ctx.beginPath();
-          // white background
+        //   // white background
-          this.canvas_ctx.fillRect(0,0,this.canvas_w,this.canvas_w);
+        //   this.canvas_ctx.fillRect(0,0,this.w,this.w);
-
+        //
-          this.canvas_ctx.globalAlpha = this.faded ? 0.15 : 1;
+        //   this.canvas_ctx.globalAlpha = this.faded ? 0.15 : 1;
-
+        //
-          if(this.opened){
+        //   if(this.opened){
-            // carre plein
+        //     // carre plein
-            // this.canvas_ctx.lineWidth = '1px';
+        //     // this.canvas_ctx.lineWidth = '1px';
-            // this.canvas_ctx.strokeStyle = 'rgb(255,0,0)';
+        //     // this.canvas_ctx.strokeStyle = 'rgb(255,0,0)';
-            // this.canvas_ctx.strokeRect(this.x - this.r-3,this.y - this.r-3,this.r*2+6,this.r*2+6);
+        //     // this.canvas_ctx.strokeRect(this.x - this.r-3,this.y - this.r-3,this.r*2+6,this.r*2+6);
-            // ou carre contour
+        //     // ou carre contour
-            this.canvas_ctx.save(); // save the normal context state (fill white)
+        //     this.canvas_ctx.save(); // save the normal context state (fill white)
-            this.canvas_ctx.fillStyle = _ecolors[this.e_color];
+        //     this.canvas_ctx.fillStyle = _ecolors[this.e_color];
-            this.canvas_ctx.fillRect(this.line_width,this.line_width,this.d,this.d);
+        //     this.canvas_ctx.fillRect(this.line_width,this.line_width,this.d,this.d);
-            this.canvas_ctx.restore(); // restore the normal context state (fill white)
+        //     this.canvas_ctx.restore(); // restore the normal context state (fill white)
-          }
+        //   }
-          // else{
+        //   // else{
-          //   // carre plein
+        //   //   // carre plein
-          //   // this.canvas_ctx.fillStyle = _ecolors[this.e_color];
+        //   //   // this.canvas_ctx.fillStyle = _ecolors[this.e_color];
-          //   // this.canvas_ctx.fillRect(this.x - this.r,this.y - this.r,this.d,this.d);
+        //   //   // this.canvas_ctx.fillRect(this.x - this.r,this.y - this.r,this.d,this.d);
-          //   // ou carre contour
+        //   //   // ou carre contour
-          //   this.canvas_ctx.fillRect(this.line_width,this.line_width,this.d,this.d);
+        //   //   this.canvas_ctx.fillRect(this.line_width,this.line_width,this.d,this.d);
-          // }
+        //   // }
-          this.canvas_ctx.strokeStyle = _ecolors[this.e_color];
+        //   this.canvas_ctx.strokeStyle = _ecolors[this.e_color];
-          this.canvas_ctx.strokeRect(this.line_width,this.line_width,this.d,this.d);
+        //   this.canvas_ctx.strokeRect(this.line_width,this.line_width,this.d,this.d);
-          // this.canvas_ctx.globalAlpha = 1;
+        //   // this.canvas_ctx.globalAlpha = 1;
-          this.canvas_ctx.closePath();
+        //   this.canvas_ctx.closePath();
-        };
+        // };
        Node.prototype.initPhysics = function(){
          // particule
@@ -328,8 +323,8 @@
        Node.prototype.onResizeCanvas = function(){
          this.calcWallLimits();
          // TODO: scramble only if not aside or centered
          this.shuffleOriP();
          // TODO: when canvas is smaller what about nodes hors champs, they are coming back alone but it's too long
        };
        Node.prototype.shuffleOriP = function(){
@@ -345,26 +340,25 @@
            this.p.fixed = true;
          }else{
            this.p.fixed = false;
          }
-          if(this.center)
+            if(this.center)
            this.limitEvolutionZone();
-          if(!this.p.resting()){
+            // if(!this.p.resting()){
            // this.checkVelocityThreshold();
            this.checkWallBouncing();
            this.updatePos();
            if(this.scrambling){
              this.checkOriPDist();
            }
            // }
          }
          if(_mouse_in && !this.aside && !this.faded)
            this.checkMouse();
-          // if(this.debug)
+          // this.move();
-          //   console.log("Node pos: ", {x:this.x, y:this.y});
+          this.redraw();
          this.move();
        };
        Node.prototype.checkVelocityThreshold = function(){
@@ -442,20 +436,20 @@
        Node.prototype.open = function(){
          this.opened = true;
          _node_opened_id = this.id;
-          this.draw();
+          //this.drawSprite();
        };
        Node.prototype.close = function(){
          this.opened = false;
-          this.draw();
+          //this.drawSprite();
        };
        Node.prototype.fade = function(){
          this.faded = true;
-          this.draw();
+          //this.drawSprite();
        };
        Node.prototype.unFade = function(){
          this.faded = false;
-          this.draw();
+          //this.drawSprite();
        };
        Node.prototype.setCenteredOnEntree = function(tid){
@@ -468,7 +462,7 @@
          this.stopScrambling();
          this.unsetAside();
          this.attract.on = true;
-          this.draw();
+          //this.drawSprite();
        }
        Node.prototype.unsetCentered = function(){
          this.center = false;
@@ -482,11 +476,11 @@
          this.dist_to_attracter = this.p.distanceTo(_attracter);
          if( this.dist_to_attracter < _scene_props.width/4){
            if( this.p.velocity.length() > 0.4 ){
-              this.p.velocity.multiplyScalar(0.995);
+              this.p.velocity.multiplyScalar(0.99); // 0.995
            }
          }
-          if( Math.abs(_attracter.position.x - this.x) > _scene_props.width/3
+          if( Math.abs(_attracter.position.x - this.x) > _scene_props.width/4
-              || Math.abs(_attracter.position.y - this.y) > _scene_props.height/3){
+              || Math.abs(_attracter.position.y - this.y) > _scene_props.height/4){
            this.attract.on = true;
          }else{
            this.attract.on = false;
@@ -503,7 +497,7 @@
          this.wall_bouncing_elasticity = 0.15;
        }
        Node.prototype.unsetAside = function(){
-          console.log('unsetAside');
+          // console.log('unsetAside');
          this.aside = false;
          this.ori_p_attract.on = false;
          this.ori_p.position.x = this.ori_pos.x;
@@ -511,6 +505,18 @@
          // this.unFade();
        }
        Node.prototype.resolveNormalPos = function(){
          // console.log("resolveNormalPos");
          switch(true){
            case this.center:
              this.unsetCentered();
              break;
            case this.aside:
              this.unsetAside();
              break;
          }
        };
        Node.prototype.scramble = function(){
          this.scrambling = true;
          this.unsetCentered();
@@ -537,7 +543,39 @@
        Node.prototype.move = function(){
          // just draw the virtual node canvas into the main scene canvas at the right position
-          _ctx.drawImage(this.canvas, this.x-this.r, this.y-this.r);
+          _ctx.drawImage(this.canvas, this.x-this.w_2, this.y-this.w_2);
        };
        Node.prototype.redraw = function(){
          _ctx.beginPath();
          // white background
          _ctx.fillStyle = 'rgb(255,255,255)';
          _ctx.fillRect(this.x-this.r,this.y-this.r,this.d,this.d);
          _ctx.globalAlpha = this.faded ? 0.15 : 1;
          if(this.opened){
            // carre plein
            // _ctx.lineWidth = '1px';
            // _ctx.strokeStyle = 'rgb(255,0,0)';
            // _ctx.strokeRect(this.x - this.r-3,this.y - this.r-3,this.r*2+6,this.r*2+6);
            // ou carre contour
            // _ctx.save(); // save the normal context state (fill white)
            _ctx.fillStyle = _ecolors[this.e_color];
            _ctx.fillRect(this.x-this.r,this.y-this.r,this.d,this.d);
            // _ctx.restore(); // restore the normal context state (fill white)
          }
          // else{
          //   // carre plein
          //   // _ctx.fillStyle = _ecolors[this.e_color];
          //   // _ctx.fillRect(this.x - this.r,this.y - this.r,this.d,this.d);
          //   // ou carre contour
          //   _ctx.fillRect(this.line_width,this.line_width,this.d,this.d);
          // }
          _ctx.strokeStyle = _ecolors[this.e_color];
          _ctx.strokeRect(this.x-this.r,this.y-this.r,this.d,this.d);
          // _ctx.globalAlpha = 1;
          _ctx.closePath();
        };
        Node.initialized = true;
@@ -545,9 +583,18 @@
      this.init();
    };
    // TODO: we may convert a lot of computation into a web worker
    // https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Using_web_workers
    function checkParticulesCollisions(){
      // do not run particule collision every frames
      if(check_parts_colid_tick < check_parts_colid_frq){
        check_parts_colid_tick++;
        return;
      }
      check_parts_colid_tick = 1;
      // pre create vars to save memory;
      var na,nb,
          ma,mb,
@@ -559,10 +606,10 @@
      // colisions between _particules
      for (var n = 0, l = _nodes.length; n < l; n++) {
        na = _nodes[n];
        // avoid colliding for centered nodes
        // if(_nodes[n].center) continue;
        // avoid colliding for scrambling nodes
-        if(na.scrambling) continue;
+        // avoid colliding for aside nodes
        // avoid colliding for centered nodes
        if(na.scrambling || na.aside || na.center) continue;
        ma = na.p.mass;
@@ -571,16 +618,16 @@
          // avoid impact between center and aside particules
          // if((na.center && nb.aside) || (na.aside && nb.center))
          // and between aside particules
-          if(na.aside || nb.aside)
+          if(nb.aside)
            continue;
          // avoid impact between two centered particulses that comes to the center
-          if(na.center && nb.center){
+          // if(na.center && nb.center){
-            if(Math.min(na.p.distanceTo(_attracter), nb.p.distanceTo(_attracter)) > 300){
+          //   if(Math.min(na.p.distanceTo(_attracter), nb.p.distanceTo(_attracter)) > 300){
-              if( Math.random()>0.3 ) continue;
+          //     if( Math.random()>0.3 ) continue;
-            }
+          //   }
-          }
+          // }
          w = h = (na.r+nb.r);
          // if(!na.aside && !nb.aside){
@@ -684,7 +731,6 @@
      // console.log('_physics.attractions.length', _physics.attractions.length);
    };
    //  ___              _             ___ _           _ _    _
    // | _ \__ _ _ _  __| |___ _ __   | _ \ |__ _ _  _| (_)__| |_
    // |   / _` | ' \/ _` / _ \ '  \  |  _/ / _` | || | | (_-<  _|
@@ -771,7 +817,8 @@
    // / __| ___ __ _ _ _ __| |_
    // \__ \/ -_) _` | '_/ _| ' \
    // |___/\___\__,_|_| \__|_||_|
-    function filterSearchResults(nids){
+    // and ajax modal content filtering
    function filterByNids(nids){
      shutDownArticles();
      _nodes_centered = [];
@@ -793,6 +840,13 @@
    // \__ \/ _| '_/ _` | '  \| '_ \ | | ' \/ _` |
    // |___/\__|_| \__,_|_|_|_|_.__/_|_|_||_\__, |
    //                                      |___/
    // function resolveNormalPosAllNodes(){
    //   console.log('resolveNormalPosAllNodes');
    //   for (var i = 0; i < _nodes.length; i++) {
    //     _nodes[i].resolveNormalPos();
    //   }
    // };
    function scrambleCollection(){
      // console.log('scrambleCollection');
      for (var i = 0; i < _nodes.length; i++) {
@@ -940,6 +994,11 @@
        })
        .on('close-all-entree', function(e){
          closeAllEntries();
        })
        .on('scramble-collection', function(e){
          console.log('scramble-collection', e);
          // resolveNormalPosAllNodes();
          scrambleCollection();
        });
      _$entrees_block_termlinks.on('click', function(event) {
@@ -968,10 +1027,15 @@
        .on('chutier-action-done', function(e) {
          _nodes_by_nid[e.target_id].chutier_action = e.new_action;
        })
        .on('ajax-node-loaded-linked-documents', function(e){
          console.log("Edlp Corpus, ajax-node-loaded-linked-documents",e.nids);
          // filter map's nodes
          filterByNids(e.nids);
        })
        .on('search-results-loaded', function(e){
          //console.log("Edlp Corpus, search-results-loaded",e.results);
-          // TODO: filter map's nodes
+          // filter map's nodes
-          filterSearchResults(e.results);
+          filterByNids(e.results);
        })
        .on('search-closed', function(e){
          scrambleCollection();
@@ -1,125 +1,4 @@
 (function ($, Drupal, drupalSettings) {
-  var settings = drupalSettings.edlp_search;
+(function($,Drupal,drupalSettings){var settings=drupalSettings.edlp_search;var _$body=$('body');var _$container;var _$form;function init(){initEvents();initAjax();};function initEvents(){$('body').on('new-content-ajax-loaded',initAjax).on('edlp_search_search_form-col-closed',onSearchClosed);};function initAjax(){_$form=$('#edlp-search-form:not(.ajax-enabled)');if(!_$form.length)return false;_$form=$('#edlp-search-form:not(.ajax-enabled)').on('submit',onSubmitForm).addClass('ajax-enabled');_$container=_$form.parents('.row');if(!_$container.length){_$container=_$form.parent();}};function onSubmitForm(e){e.preventDefault();var args={};args.keys=$('input[type="search"]',this).val();args.entries=[];$('input[type="checkbox"]:checked','#edit-entries').each(function(index,el){args.entries.push($(this).val());});args.langues=$('input[name="language"]',this).val();args.genres=$('input[name="genres"]',this).val();loadResults(args);return false;};function loadResults(args){_$form.addClass('ajax-loading');_$body.addClass('ajax-loading');$('[theme="edlp_search_results"]',_$container).addClass('ajax-loading');var path=window.location.origin+drupalSettings.path.baseUrl+settings.results_ajax_url;$.getJSON(path,args).done(function(data){onResultsLoaded(data);}).fail(function(jqxhr,textStatus,error){onResultsLoadFail(jqxhr,textStatus,error);});};function onResultsLoaded(data){_$form.removeClass('ajax-loading');_$body.removeClass('ajax-loading');$prev_results=$('[theme="edlp_search_results"]',_$container);if($prev_results.length){$prev_results.replaceWith(data.rendered);}else{_$container.append(data.rendered);}
-  var _$body = $('body');
+_$body.trigger({'type':'search-results-loaded','results':data.results_nids});if(typeof _paq!=='undefined'){var search_name=data.keys+';'+data.langues+';'+data.genres+';'+data.entry_names.join(',');_paq.push(['trackSiteSearch',search_name,'search',data.results_nids.length]);}};function onResultsLoadFail(jqxhr,textStatus,error){void 0;};function onSearchClosed(e){$('div[theme="edlp_search_results"]').remove();_$body.trigger({'type':'search-closed'});}
-  var _$container;
+init();})(jQuery,Drupal,drupalSettings);
  var _$form;
  function init(){
    // console.log('EdlpSearch Init', settings);
    initEvents();
    initAjax();
  };
  function initEvents(){
    $('body')
      .on('new-content-ajax-loaded', initAjax)
      .on('edlp_search_search_form-col-closed', onSearchClosed);
  };
  function initAjax(){
    _$form = $('#edlp-search-form:not(.ajax-enabled)');
    if(!_$form.length) return false;
    //console.log('EdlpSearch initAjaxForm()');
    _$form = $('#edlp-search-form:not(.ajax-enabled)')
      .on('submit', onSubmitForm)
      .addClass('ajax-enabled');
    _$container = _$form.parents('.row');
    if(!_$container.length){
      _$container = _$form.parent();
    }
  };
  function onSubmitForm(e){
    e.preventDefault();
    // console.log('onSubmitForm',e);
    var args = {};
    // search for key words
    args.keys = $('input[type="search"]', this).val();
    // entries filter
    args.entries = [];
    $('input[type="checkbox"]:checked', '#edit-entries').each(function(index, el) {
      args.entries.push($(this).val());
    });
    // langues
    args.langues = $('input[name="language"]', this).val();
    // genres
    args.genres = $('input[name="genres"]', this).val();
    //console.log('EdlpSearch onSubmitForm() : args',args);
    loadResults(args);
    return false;
  };
  function loadResults(args){
    //console.log('EdlpSearch loadResults() : args', args);
    _$form.addClass('ajax-loading');
    _$body.addClass('ajax-loading');
    $('[theme="edlp_search_results"]', _$container).addClass('ajax-loading');
    var path = window.location.origin + drupalSettings.path.baseUrl +settings.results_ajax_url;
    $.getJSON(path, args)
      .done(function(data){
        onResultsLoaded(data);
      })
      .fail(function(jqxhr, textStatus, error){
        onResultsLoadFail(jqxhr, textStatus, error);
      });
  };
  function onResultsLoaded(data){
    // console.log('EdlpSearch onResultsLoaded()', data);
    _$form.removeClass('ajax-loading');
    _$body.removeClass('ajax-loading');
    // insert results col
    $prev_results = $('[theme="edlp_search_results"]', _$container);
    if($prev_results.length){
      $prev_results.replaceWith(data.rendered);
    }else{
      _$container.append(data.rendered);
    }
    // trigger event
    _$body.trigger({
      'type':'search-results-loaded',
      'results':data.results_nids
    });
    // piwik
    if(typeof _paq !== 'undefined'){
      // page tracking
      // https://matomo.org/blog/2017/02/how-to-track-single-page-websites-using-piwik-analytics/
      // _paq.push(['setCustomUrl', state.url]);
      // _paq.push(['setDocumentTitle', data.title]);
      // _paq.push(['trackPageView']);
      // trackEvent(category, action, [name], [value])
      var search_name = data.keys+';'+data.langues+';'+data.genres+';'+data.entry_names.join(',');
      // _paq.push(['trackEvent', 'AjaxSearch', 'Results', search_name, data.results_nids.length]);
      // piwik track searches
      // trackSiteSearch(keyword, [category], [resultsCount])
      _paq.push(['trackSiteSearch', search_name, 'search', data.results_nids.length]);
    }
  };
  function onResultsLoadFail(jqxhr, textStatus, error){
    console.warn('EdlpSearch : search results ajax load failed : '+error, jqxhr.responseText);
  };
  function onSearchClosed(e){
    // console.log('Edlp Search onSearchClosed()');
    $('div[theme="edlp_search_results"]').remove();
    // trigger event
    _$body.trigger({'type':'search-closed'});
  }
  init();
 })(jQuery, Drupal, drupalSettings);
@@ -1,408 +1,10 @@
 (function ($, Drupal, drupalSettings) {
-  var _settings = drupalSettings.edlp_studio;
+(function($,Drupal,drupalSettings){var _settings=drupalSettings.edlp_studio;var $composer;function init(){initEvents();initStudio();};function initEvents(){$('body').on('new-audio-cartel-loaded',initAjaxChutierLinks).on('new-content-ajax-loaded',initStudio).on('all-modal-closed',initStudio);};function initStudio(){if($('#studio-ui').length){$composer=$('.composition_ui .composer','#studio-ui');initAjaxChutierLinks();initAjaxCompoLinks();initDragAndDropUI();$('body').trigger({'type':'studio-initialized'});}else{$('body').trigger({'type':'studio-not-active'});}}
-  var $composer;
+function initAjaxChutierLinks(){$('.chutier-ajax-link:not(.ajax-enabled)').addClass('ajax-enabled').on('click',onClickChutierAjaxLink);};function onClickChutierAjaxLink(e){e.preventDefault();addRemoveToChutier($(this));return false;};function addRemoveToChutier($link){var ajax_path=$link.attr('data-drupal-link-system-path');var path=window.location.origin+drupalSettings.path.baseUrl+ajax_path;$link.addClass('ajax-loading');$.getJSON(path,{}).done(function(data){onActionToChutierDone($link,data);}).fail(function(jqxhr,textStatus,error){onErrorActionToChutier(jqxhr,textStatus,error,$link);});};function onActionToChutierDone($link,data){$('body').trigger({'type':'chutier-action-done','action_done':data.action_done,'new_action':data.action_done=='add'?'remove':'add','target_id':$link.attr('target_id'),});$link.replaceWith(data.new_link);initAjaxChutierLinks();updateStudioChutier();};function onErrorActionToChutier(jqxhr,textStatus,error,$link){void 0;};function initAjaxCompoLinks(){$('.new-composition-link:not(.ajax-enabled)').on('click',onClickNewCompoLink).addClass('ajax-enabled');$('.composition-link:not(.ajax-enabled)').on('click',onClickCompoLink).addClass('ajax-enabled');$('.delete-composition-link:not(.ajax-enabled)').on('click',onClickDeleteCompoLink).addClass('ajax-enabled');};function onClickCompoLink(e){e.preventDefault();openCompo($(this));return false;};function openCompo($link){var cid=$link.attr('cid');var ajax_path=_settings.open_compo_ajax_url+'/'+cid;var path=window.location.origin+Drupal.url(ajax_path);$link.addClass('ajax-loading');$composer.addClass('ajax-loading');$.getJSON(path,{}).done(function(data){onOpenCompoDone(data,$link);}).fail(function(jqxhr,textStatus,error){onErrorOpenCompo(jqxhr,textStatus,error,$link);});};function onOpenCompoDone(data,$link){$('.composition-link').removeClass('is-active');$link.removeClass('ajax-loading').addClass('is-active');if($('.composition',$composer).length){$('.composition',$composer).replaceWith(data.compo);}else{$('header',$composer).after(data.compo);}
-
+$composer.removeClass('ajax-loading');initDragAndDropUI();$('body').trigger({'type':'on-studio-compo-opened'});};function onErrorOpenCompo(jqxhr,textStatus,error,$link){$link.removeClass('ajax-loading');void 0;};function onClickNewCompoLink(e){e.preventDefault();setInputForNewCompoName($(this));return false;};function setInputForNewCompoName($link){var $form=$('<form>').addClass('new-compo-form').append($('<input>').attr('type','text').attr('placeholder','new name')).append($('<button>').attr('type','submit').html('+')).submit(function(e){onNewCompoFormSubmit(e,$link,$(this));});$link.after($form).addClass('folded');$form.children('input[type="text"]').focus();};function onNewCompoFormSubmit(e,$link,$form){var name=$('input[type="text"]',$form).val();if(name!=''){$form.addClass('ajax-loading').children('*').attr('disabled','disabled');createNewCompo(name,$link,$form);}
-  // audio play is handled by edlp_theme
+e.preventDefault();};function createNewCompo(name,$link,$form){var ajax_path=$link.attr('data-drupal-link-system-path');var path=window.location.origin+drupalSettings.path.baseUrl+ajax_path;$.getJSON(path,{'new_name':name}).done(function(data){onCreateCompoDone(data,$link,$form);}).fail(function(jqxhr,textStatus,error){onErrorCreateCompo(jqxhr,textStatus,error,$link);});};function onCreateCompoDone(data,$link,$form){var $new_link=$(data.new_link);var $delete_link=$(data.delete_link);$link.removeClass('folded').parents('li').before($('<li>').append($new_link).append($delete_link));$form.remove();initAjaxCompoLinks();openCompo($new_link);};function onErrorCreateCompo(jqxhr,textStatus,error,$link){void 0;};function onClickDeleteCompoLink(e){e.preventDefault();deleteCompo($(this));return false;};function deleteCompo($link){var ajax_path=$link.attr('data-drupal-link-system-path');var path=window.location.origin+Drupal.url(ajax_path);$link.parents('li').addClass('ajax-loading');$.getJSON(path,{}).done(function(data){onDeleteCompoDone(data,$link);}).fail(function(jqxhr,textStatus,error){onErrorDeleteCompo(jqxhr,textStatus,error,$link);});};function onDeleteCompoDone(data,$link,$form){if(data.status=="ok"){$link.parents('li').remove();if($('.composition-link').length){openCompo($('.composition-link').eq(0));}else{$('.composition',$composer).html();}}else{void 0;}};function onErrorDeleteCompo(jqxhr,textStatus,error,$link){$link.parents('li').removeClass('ajax-loading');void 0;};function updateStudioChutier(){$studioChutier=$('#studio-ui .chutier_ui');if($studioChutier.length){var ajax_path=_settings.chutier_ui_ajax;var path=window.location.origin+drupalSettings.path.baseUrl+ajax_path;$studioChutier.addClass('loading');$.getJSON(path,{}).done(function(data){onLoadedChutier($studioChutier,data);}).fail(function(jqxhr,textStatus,error){onLoadChutierError(jqxhr,textStatus,error,$studioChutier);});}};function onLoadedChutier($studioChutier,data){$studioChutier.replaceWith(data.rendered);initAjaxChutierLinks();setChutierDraggable();$('body').trigger({'type':'on-studio-chutier-updated'});}
-
+function onLoadChutierError(jqxhr,textStatus,error,$studioChutier){void 0;$studioChutier.removeClass('loading');}
-  function init(){
+function initDragAndDropUI(){if(!$('.composition_ui .composer .composition .field--name-documents').length){$field_documents=$('<div>').addClass('field').addClass('field--name-documents').appendTo('.composition_ui .composer .composition');}else{$field_documents=$('.composition_ui .composer .composition .field--name-documents');$('.field__item',$field_documents).each(function(i){$(this).prepend($('<span>').addClass('handler'));});}
-    // console.log('Studio Init');
+var $remove_zone=$('<div>').addClass('remove-drop-zone').appendTo('.composition_ui .composer .composition').droppable({tolerance:'pointer',over:function(e,ui){ui.draggable.addClass('ready-to-remove');},out:function(e,ui){ui.draggable.removeClass('ready-to-remove');},drop:function(e,ui){ui.draggable.remove();}});$field_documents.sortable({revert:false,handle:".handler",receive:function(e,ui){$('.field__item',this).attr('style','');},update:function(e,ui){onOrderChanged(e,ui);},connectWith:$remove_zone,});setChutierDraggable();};function setChutierDraggable(){$('.chutier_ui .item-list li>div').draggable({containment:$('#studio-ui'),scroll:false,helper:function(e){return $('<div>').addClass('field__item').append($('<article>').addClass('node').append($('<h2>').addClass('node-title').append($('.audio-link',this).clone().removeClass('ajax-enable')))).prepend($('<span>').addClass('handler'));},cursorAt:{bottom:10,left:10},zIndex:999,revert:true,revertDuration:0,connectToSortable:$('.composition_ui .composer .composition .field--name-documents'),});}
-    initEvents();
+function onOrderChanged(e,ui){var cid=$(e.target).parents('.composition').attr('cid');var documents={};$('a',e.target).each(function(i){documents[i]=$(this).attr('nid');});recordCompoList(cid,documents);};function recordCompoList(cid,docs){var ajax_path=_settings.save_compo_ajax_url+'/'+cid;var path=window.location.origin+Drupal.url(ajax_path);$.getJSON(path,{documents:docs}).done(function(data){onRecordCompoDone(data);}).fail(function(jqxhr,textStatus,error){onErrorRecordCompo(jqxhr,textStatus,error);});$('body').trigger({'type':'on-studio-compo-updated'});}
-    initStudio();
+function onRecordCompoDone(data){if(data.status=="ok"){}else{void 0;}};function onErrorRecordCompo(jqxhr,textStatus,error){void 0;};init();})(jQuery,Drupal,drupalSettings);
  };
  function initEvents(){
    $('body')
      .on('new-audio-cartel-loaded', initAjaxChutierLinks)
      .on('new-content-ajax-loaded', initStudio)
      .on('all-modal-closed', initStudio);
  };
  function initStudio(){
    if($('#studio-ui').length){
      $composer = $('.composition_ui .composer', '#studio-ui');
      initAjaxChutierLinks();
      initAjaxCompoLinks();
      initDragAndDropUI();
      $('body').trigger({'type':'studio-initialized'});
    }else{
      $('body').trigger({'type':'studio-not-active'});
    }
  }
  //   ___ _        _   _           _  _         _       _    _      _
  //  / __| |_ _  _| |_(_)___ _ _  | \| |___  __| |___  | |  (_)_ _ | |__ ___
  // | (__| ' \ || |  _| / -_) '_| | .` / _ \/ _` / -_) | |__| | ' \| / /(_-<
  //  \___|_||_\_,_|\__|_\___|_|   |_|\_\___/\__,_\___| |____|_|_||_|_\_\/__/
  function initAjaxChutierLinks(){
    //console.log('studio initAjaxChutierLinks');
    $('.chutier-ajax-link:not(.ajax-enabled)')
      .addClass('ajax-enabled')
      .on('click', onClickChutierAjaxLink);
  };
  function onClickChutierAjaxLink(e){
    //console.log('studio onClickAjaxLink chutier');
    e.preventDefault();
    addRemoveToChutier($(this));
    return false;
  };
  function addRemoveToChutier($link){
    // var ajax_path = 'edlp_studio/ajax/chutier/add/'+id; // + '/' +cid;
    var ajax_path = $link.attr('data-drupal-link-system-path');
    var path = window.location.origin + drupalSettings.path.baseUrl + ajax_path;
    $link.addClass('ajax-loading');
    $.getJSON(path, {})
      .done(function(data){
        onActionToChutierDone($link, data);
      })
      .fail(function(jqxhr, textStatus, error){
        onErrorActionToChutier(jqxhr, textStatus, error, $link);
      });
  };
  function onActionToChutierDone($link, data){
    //console.log('onActionToChutierDone',data);
    $('body').trigger({
      'type':'chutier-action-done',
      'action_done':data.action_done,
      'new_action':data.action_done == 'add' ? 'remove' : 'add',
      'target_id':$link.attr('target_id'),
    });
    $link.replaceWith(data.new_link);
    initAjaxChutierLinks();
    // reload Studio chutier_ui's documents list
    updateStudioChutier();
  };
  function onErrorActionToChutier(jqxhr, textStatus, error, $link){
    console.warn('action to chuttier load failed : '+error, jqxhr.responseText);
  };
  //   ___                        _ _   _
  //  / __|___ _ __  _ __  ___ __(_) |_(_)___ _ _  ___
  // | (__/ _ \ '  \| '_ \/ _ (_-< |  _| / _ \ ' \(_-<
  //  \___\___/_|_|_| .__/\___/__/_|\__|_\___/_||_/__/
  //                |_|
  function initAjaxCompoLinks(){
    //console.log('studio initAjaxCompoLinks');
    $('.new-composition-link:not(.ajax-enabled)')
    .on('click', onClickNewCompoLink)
      .addClass('ajax-enabled');
    $('.composition-link:not(.ajax-enabled)')
    .on('click', onClickCompoLink)
      .addClass('ajax-enabled');
    $('.delete-composition-link:not(.ajax-enabled)')
      .on('click', onClickDeleteCompoLink)
      .addClass('ajax-enabled');
  };
  //   ___                    ___
  //  / _ \ _ __  ___ _ _    / __|___ _ __  _ __  ___
  // | (_) | '_ \/ -_) ' \  | (__/ _ \ '  \| '_ \/ _ \
  //  \___/| .__/\___|_||_|  \___\___/_|_|_| .__/\___/
  //       |_|                             |_|
  function onClickCompoLink(e){
    e.preventDefault();
    //console.log('onClickCompoLink');
    openCompo($(this));
    return false;
  };
  function openCompo($link){
    var cid = $link.attr('cid');
    var ajax_path = _settings.open_compo_ajax_url+'/'+cid;
    var path = window.location.origin + Drupal.url(ajax_path);
    $link.addClass('ajax-loading');
    $composer.addClass('ajax-loading');
    $.getJSON(path, {})
      .done(function(data){
        onOpenCompoDone(data, $link);
      })
      .fail(function(jqxhr, textStatus, error){
        onErrorOpenCompo(jqxhr, textStatus, error, $link);
      });
  };
  function onOpenCompoDone(data, $link){
    //console.log('onActionToCompoDone',data);
    $('.composition-link').removeClass('is-active');
    $link.removeClass('ajax-loading').addClass('is-active');
    if($('.composition', $composer).length){
      $('.composition', $composer).replaceWith(data.compo);
    }else{
      $('header', $composer).after(data.compo);
    }
    $composer.removeClass('ajax-loading');
    initDragAndDropUI();
    $('body').trigger({
      'type':'on-studio-compo-opened'
    });
  };
  function onErrorOpenCompo(jqxhr, textStatus, error, $link){
    $link.removeClass('ajax-loading');
    console.warn('open compo load failed : '+error, jqxhr.responseText);
  };
  //  _ _  _____ __ __  __ ___ _ __  _ __  ___
  // | ' \/ -_) V  V / / _/ _ \ '  \| '_ \/ _ \
  // |_||_\___|\_/\_/  \__\___/_|_|_| .__/\___/
  //                                |_|
  function onClickNewCompoLink(e){
    e.preventDefault();
    setInputForNewCompoName($(this));
    return false;
  };
  function setInputForNewCompoName($link){
    var $form = $('<form>').addClass('new-compo-form')
      .append($('<input>').attr('type', 'text').attr('placeholder', 'new name'))
      .append($('<button>').attr('type', 'submit').html('+'))
      .submit(function(e){
        onNewCompoFormSubmit(e, $link, $(this));
      });
    $link
      .after($form)
      .addClass('folded');
    $form.children('input[type="text"]').focus();
  };
  function onNewCompoFormSubmit(e, $link, $form){
    var name = $('input[type="text"]',$form).val();
    //console.log('onNewCompoFormSubmit', name);
    if(name != ''){
      $form.addClass('ajax-loading').children('*').attr('disabled', 'disabled');
      createNewCompo(name, $link, $form);
    }
    e.preventDefault();
  };
  function createNewCompo(name,$link, $form){
    var ajax_path = $link.attr('data-drupal-link-system-path');
    var path = window.location.origin + drupalSettings.path.baseUrl + ajax_path;
    // $link.addClass('ajax-loading');
    $.getJSON(path, {
        'new_name':name
      })
      .done(function(data){
        onCreateCompoDone(data, $link, $form);
      })
      .fail(function(jqxhr, textStatus, error){
        onErrorCreateCompo(jqxhr, textStatus, error, $link);
      });
  };
  function onCreateCompoDone(data, $link, $form){
    //console.log('onActionToCompoDone',data);
    var $new_link = $(data.new_link);
    var $delete_link = $(data.delete_link);
    $link
      .removeClass('folded')
      .parents('li')
        .before($('<li>').append($new_link).append($delete_link));
    $form.remove();
    // open new composition to composer
    initAjaxCompoLinks();
    openCompo($new_link);
  };
  function onErrorCreateCompo(jqxhr, textStatus, error, $link){
    console.warn('action to compo load failed : '+error, jqxhr.responseText);
  };
  // ___      _     _
  // |   \ ___| |___| |_ ___   __ ___ _ __  _ __  ___
  // | |) / -_) / -_)  _/ -_) / _/ _ \ '  \| '_ \/ _ \
  // |___/\___|_\___|\__\___| \__\___/_|_|_| .__/\___/
  //                                       |_|
  function onClickDeleteCompoLink(e){
    e.preventDefault();
    // TODO: confirm compo deletion
    deleteCompo($(this));
    return false;
  };
  function deleteCompo($link){
    var ajax_path = $link.attr('data-drupal-link-system-path');
    var path = window.location.origin + Drupal.url(ajax_path);
    $link.parents('li').addClass('ajax-loading');
    $.getJSON(path, {})
      .done(function(data){
        onDeleteCompoDone(data, $link);
      })
      .fail(function(jqxhr, textStatus, error){
        onErrorDeleteCompo(jqxhr, textStatus, error, $link);
      });
  };
  function onDeleteCompoDone(data, $link, $form){
    //console.log('onDeleteCompoDone',data);
    if(data.status == "ok"){
      $link.parents('li').remove();
      //console.log("$('.composition-link').length", $('.composition-link').length);
      if($('.composition-link').length){
        openCompo($('.composition-link').eq(0));
      }else{
        $('.composition', $composer).html();
      }
    }else{
      console.warn(data.message);
    }
  };
  function onErrorDeleteCompo(jqxhr, textStatus, error, $link){
    $link.parents('li').removeClass('ajax-loading');
    console.warn('delete compo load failed : '+error, jqxhr.responseText);
  };
  //  ___ _           _ _              _
  // / __| |_ _  _ __| (_)___ ___ _  _(_)
  // \__ \  _| || / _` | / _ \___| || | |
  // |___/\__|\_,_\__,_|_\___/    \_,_|_|
  // this seems dirty
  function updateStudioChutier(){
    $studioChutier = $('#studio-ui .chutier_ui');
    if($studioChutier.length){
      var ajax_path = _settings.chutier_ui_ajax;
      var path = window.location.origin + drupalSettings.path.baseUrl + ajax_path;
      $studioChutier.addClass('loading');
      $.getJSON(path, {})
        .done(function(data){
          onLoadedChutier($studioChutier, data);
        })
        .fail(function(jqxhr, textStatus, error){
          onLoadChutierError(jqxhr, textStatus, error, $studioChutier);
        });
    }
  };
  function onLoadedChutier($studioChutier, data){
    $studioChutier.replaceWith(data.rendered);
    initAjaxChutierLinks();
    // set chutier element draggable again
    setChutierDraggable();
    $('body').trigger({
      'type':'on-studio-chutier-updated'
    });
  }
  function onLoadChutierError(jqxhr, textStatus, error, $studioChutier){
    console.warn('Chutier load failed', jqxhr.responseText);
    $studioChutier.removeClass('loading');
  }
  //  ___                  __       ___                 _   _ ___
  // |   \ _ _ __ _ __ _  / _|___  |   \ _ _ ___ _ __  | | | |_ _|
  // | |) | '_/ _` / _` | > _|_ _| | |) | '_/ _ \ '_ \ | |_| || |
  // |___/|_| \__,_\__, | \_____|  |___/|_| \___/ .__/  \___/|___|
  //               |___/                        |_|
  function initDragAndDropUI(){
    // check if field--name-documents exists
    if (!$('.composition_ui .composer .composition .field--name-documents').length) {
      // if not create it
      $field_documents = $('<div>')
        .addClass('field').addClass('field--name-documents')
        .appendTo('.composition_ui .composer .composition');
    }else{
      // add real dom square element to handle sorting
      $field_documents = $('.composition_ui .composer .composition .field--name-documents'); $('.field__item', $field_documents).each(function(i){
        $(this).prepend($('<span>').addClass('handler'));
      });
    }
    // create remove dropzone
    var $remove_zone = $('<div>').addClass('remove-drop-zone')
      .appendTo('.composition_ui .composer .composition')
      .droppable({
        tolerance:'pointer',
        // scope:'composition_ui',
        over:function(e,ui){
          // console.log('on over remove : ui', ui);
          ui.draggable.addClass('ready-to-remove');
        },
        out:function(e,ui){
          // console.log('on over remove : ui', ui);
          ui.draggable.removeClass('ready-to-remove');
        },
        drop:function(e,ui){
          // console.log('on drop remove : ui', ui);
          ui.draggable.remove();
          // onOrderChanged(ui);
        }
      });
    // create sortable
    $field_documents.sortable({
      revert:false,
      handle: ".handler",
      receive:function(e, ui){
        $('.field__item', this).attr('style', '');
        // TODO: trigger event to enable new audiolink player
      },
      update:function(e, ui){
        onOrderChanged(e, ui);
      },
      connectWith : $remove_zone,
    });
    // set chutier element draggable
    setChutierDraggable();
  };
  function setChutierDraggable(){
    $('.chutier_ui .item-list li>div').draggable({
      containment:$('#studio-ui'),
      scroll:false,
      helper:function(e){
        // we reproduce here the irem structure of destination sortable elements
        // var $audio_link = $('.audio-link',this);
        return $('<div>').addClass('field__item')
          .append(
            $('<article>').addClass('node').append(
              $('<h2>').addClass('node-title').append(
                // $('<a>')
                //   .attr('nid', $audio_link.attr('nid'))
                //   .html($audio_link.html())
                $('.audio-link',this).clone().removeClass('ajax-enable')
              )
            )
          )
          .prepend($('<span>').addClass('handler'));
      },
      // cursor:'grab',
      cursorAt:{bottom:10,left:10},
      zIndex:999,
      revert:true,
      revertDuration:0,
      connectToSortable:$('.composition_ui .composer .composition .field--name-documents'),
    });
  }
  function onOrderChanged(e, ui){
    //console.log('onOrderChanged : e', e);
    var cid = $(e.target).parents('.composition').attr('cid');
    var documents = {};
    $('a', e.target).each(function(i) {
      // console.log(this);
      documents[i] = $(this).attr('nid');
    });
    // console.log(documents);
    recordCompoList(cid, documents);
  };
  function recordCompoList(cid, docs){
    //console.log('recordCompoList '+cid, docs);
    var ajax_path = _settings.save_compo_ajax_url+'/'+cid;
    var path = window.location.origin + Drupal.url(ajax_path);
    //console.log('path', path);
    $.getJSON(path, {
        documents:docs
      })
      .done(function(data){
        onRecordCompoDone(data);
      })
      .fail(function(jqxhr, textStatus, error){
        onErrorRecordCompo(jqxhr, textStatus, error);
      });
    $('body').trigger({
      'type':'on-studio-compo-updated'
    });
  }
  function onRecordCompoDone(data){
    //console.log('onDeleteCompoDone',data);
    if(data.status == "ok"){
    }else{
      console.warn(data.message);
    }
  };
  function onErrorRecordCompo(jqxhr, textStatus, error){
    console.warn('record compo failed : '+error, jqxhr.responseText);
  };
  init();
 })(jQuery, Drupal, drupalSettings);
@@ -1,20 +1,2 @@
 console.log('EDLP THEME HISTORY.js');
 // var edlp is provided by edlp_ajax.module file
 if(edlp.redirect){
  console.log('history redirect', edlp);
  console.log('window.location', window.location);
  // window.localStorage.setItem('edlp_origin_path', edlp.sys_path.replace(/^\//, ''));
  edlp.sys_path = edlp.sys_path.replace(/^\//, '');
-  // window.localStorage.setItem('edlp_origin_url', window.location.pathname);
+void 0;if(edlp.redirect){void 0;void 0;edlp.sys_path=edlp.sys_path.replace(/^\//,'');edlp.url=window.location.pathname;edlp.hash=window.location.hash;window.localStorage.setItem('edlp_origin',JSON.stringify(edlp));window.location.replace(window.location.origin+'/'+edlp.lang_code);}else{void 0;}
  edlp.url = window.location.pathname;
  // window.localStorage.setItem('edlp_origin_hash', window.location.hash);
  edlp.hash = window.location.hash;
  window.localStorage.setItem('edlp_origin', JSON.stringify(edlp));
  // redirect to home
  window.location.replace(window.location.origin+'/'+edlp.lang_code);
 }else{
  console.log('history do not redirect');
 }
@@ -15,6 +15,7 @@
      start:0,
      end:0
    };
    var _corpus_promise;
    //  ___      _ _
    // |_ _|_ _ (_) |_
@@ -23,6 +24,11 @@
    function init(){
      console.log("EdlpTheme init()");
      if(!drupalSettings.path.isFront)
        return;
      _deferred = initEvents();
      _audioPlayer = new AudioPlayer();
      _compoPlayer = new CompoPlayer();
@@ -30,11 +36,10 @@
      initHistory();
-      if(!drupalSettings.path.isFront)
+      // if(!drupalSettings.path.isFront)
-        return;
+      //   return;
-
+      //
-      initEvents();
+      // initEvents();
    };
    //  ___             _
@@ -42,8 +47,15 @@
    // | _|\ V / -_) ' \  _(_-<
    // |___|\_/\___|_||_\__/__/
    function initEvents(){
      // https://www.html5rocks.com/en/tutorials/async/deferred/
      var $corpus_df = $.Deferred();
      _corpus_promise = $corpus_df.promise();
      _$body
-        .on('corpus-map-ready', onCorpusMapReady)
+        .on('corpus-map-ready', function(e){
          onCorpusMapReady(e);
          $corpus_df.resolve();
        })
        .on('on-studio-chutier-updated', initAjaxLinks)
        .on('studio-initialized', function(e){
          _compoPlayer.newCompo();
@@ -247,6 +259,22 @@
          $('a[data-drupal-link-system-path="'+menu_sys_path+'"]').addClass('is-active-trail');
        }
      }
      // if entity has corpus-map's linked document call a filter to corpus map
      if(typeof data.documents_lies != 'undefined'){
        if(_corpus_ready){
          _$body.trigger({
            type:'ajax-node-loaded-linked-documents',
            nids:data.documents_lies
          });
        }else{
          _corpus_promise.done(function(){
            _$body.trigger({
              type:'ajax-node-loaded-linked-documents',
              nids:data.documents_lies
            });
          });
        }
      }
      // if block attached (eg : from edlp_productions module)
      // not used anymore as production block is always present (but not visible)
@@ -378,12 +406,7 @@
      }
      // remove the col
      $col.remove();
-      // if row is empty and we are not in productions or entree notice|index call closeAllModals()
+      checkRowEmpty();
      if(!$('.col', _$row).length
        && !_$body.is('.entity-type-node.bundle-page')
        && !_$body.is('.entity-type-taxonomy_term.bundle-entrees')){
          backToFrontPage();
      }
    };
    //    _    _            ___ _         _
@@ -625,6 +648,7 @@
    // | (__/ _ \ '_| '_ \ || (_-<
    //  \___\___/_| | .__/\_,_/__/
    //              |_|
    function onCorpusMapReady(e){
      //console.log('theme : onCorpusReady', e);
      _corpus_ready = true;
@@ -1335,53 +1359,6 @@
      // }
    };
    //  ___            _   ___
    // | __| _ ___ _ _| |_| _ \__ _ __ _ ___
    // | _| '_/ _ \ ' \  _|  _/ _` / _` / -_)
    // |_||_| \___/_||_\__|_| \__,_\__, \___|
    //                             |___/
    function backToFrontPage(pop_state){
      console.log('backToFrontPage', pop_state);
      closeAllModals();
      // assume we are going back to front page
      $('body').removeClass().addClass('path-frontpage');
      $('a[data-drupal-link-system-path="<front>"]').addClass('is-active');
      // close entrees
      _$corpus_canvas.trigger({'type':'close-all-entree'});
      if(typeof pop_state == "undefined" || !pop_state){
        console.log('backToFrontPage push state');
        history.pushState({home:true}, null, drupalSettings.path.baseUrl+drupalSettings.path.currentLanguage);
      }
    }
    function initHome(){
      addCloseModalBtnToCols();
      // console.log('theme : initHome');
      // console.log('theme : initProductions');
      var $grid = $('.grid',_$row).masonry({
        itemSelector:'.col',
        columnWidth:'.col-2',
        horizontalOrder: true,
        containerStyle: null,
        // disable initial layout
        // initLayout: false,
      });
      // bind event
      // $grid.masonry( 'on', 'layoutComplete', function() {
      //   console.log('layout is complete');
      // });
      // layout Masonry after each image loads
      $grid.imagesLoaded().progress( function() {
        $grid.masonry('layout');
      });
      $grid.imagesLoaded(function(){
        $grid.masonry('layout');
      });
    }
    //  ___             _         _   _
    // | _ \_ _ ___  __| |_  _ __| |_(_)___ _ _  ___
    // |  _/ '_/ _ \/ _` | || / _|  _| / _ \ ' \(_-<
@@ -1434,6 +1411,54 @@
      });
    };
    //  ___            _   ___
    // | __| _ ___ _ _| |_| _ \__ _ __ _ ___
    // | _| '_/ _ \ ' \  _|  _/ _` / _` / -_)
    // |_||_| \___/_||_\__|_| \__,_\__, \___|
    //                             |___/
    function backToFrontPage(pop_state){
      console.log('backToFrontPage', pop_state);
      closeAllModals();
      // assume we are going back to front page
      $('body').removeClass().addClass('path-frontpage');
      $('a[data-drupal-link-system-path="<front>"]').addClass('is-active');
      // close entrees
      _$corpus_canvas.trigger({'type':'close-all-entree'});
      _$corpus_canvas.trigger({'type':'scramble-collection'});
      if(typeof pop_state == "undefined" || !pop_state){
        console.log('backToFrontPage push state');
        history.pushState({home:true}, null, drupalSettings.path.baseUrl+drupalSettings.path.currentLanguage);
      }
    }
    function initHome(){
      addCloseModalBtnToCols();
      // console.log('theme : initHome');
      // console.log('theme : initProductions');
      var $grid = $('.grid',_$row).masonry({
        itemSelector:'.col',
        columnWidth:'.col-2',
        horizontalOrder: true,
        containerStyle: null,
        // disable initial layout
        // initLayout: false,
      });
      // bind event
      // $grid.masonry( 'on', 'layoutComplete', function() {
      //   console.log('layout is complete');
      // });
      // layout Masonry after each image loads
      $grid.imagesLoaded().progress( function() {
        $grid.masonry('layout');
      });
      $grid.imagesLoaded(function(){
        $grid.masonry('layout');
      });
    }
    //  __  __         _      _
    // |  \/  |___  __| |__ _| |___
    // | |\/| / _ \/ _` / _` | (_-<
@@ -1444,6 +1469,21 @@
      _$row.html('');
      _$ajaxLinks.removeClass('is-active');
      _$body.trigger({'type':'all-modal-closed'});
      // checkRowEmpty();
    };
    function checkRowEmpty(){
      // TODO: remove is-active class from index or notice entree links
      // if row is empty and we are not in productions or entree notice|index call closeAllModals()
      if(!$('.col', _$row).length && !_$body.is('.entity-type-taxonomy_term.bundle-entrees')){
        if(!_$body.is('.entity-type-node.bundle-page')){
          // we weren't on production or entree, so go back to front page
          backToFrontPage();
        }else{
          // if we were on production page just scramble collection in case of map was filtered
          _$corpus_canvas.trigger({'type':'scramble-collection'});
        }
      }
    };
    //  _  _     _
@@ -1744,7 +1744,7 @@ footer{
        }
      }
      &.opened, &.highlighted{
-        li:not(.opened):not(.highlighted){
+        li:not(.opened):not(.highlighted):not(:hover){
          a.term-link{
            color:#a1a1a1;
          }
@@ -27,7 +27,7 @@ content:
    region: content
  field_date:
    type: daterange_custom
-    weight: 2
+    weight: 1
    region: content
    label: hidden
    settings:
@@ -37,14 +37,14 @@ content:
    third_party_settings: {  }
  field_page_liee:
    type: entity_reference_label
-    weight: 1
+    weight: 0
    region: content
    label: hidden
    settings:
      link: false
    third_party_settings: {  }
  links:
-    weight: 0
+    weight: 2
    region: content
    settings: {  }
    third_party_settings: {  }
@@ -30,14 +30,6 @@ content:
    settings: {  }
    third_party_settings: {  }
    region: content
  field_documents_lies:
    weight: 4
    label: above
    settings:
      link: true
    third_party_settings: {  }
    type: entity_reference_label
    region: content
  field_son:
    weight: 2
    label: hidden
@@ -61,12 +53,13 @@ content:
    settings: {  }
    third_party_settings: {  }
  production_subtree:
-    weight: 5
+    weight: 4
    region: content
    settings: {  }
    third_party_settings: {  }
 hidden:
  field_afficher_en_page_d_acceuil: true
  field_documents_lies: true
  field_page_type: true
  field_view_mode: true
  field_workflow_generic: true
@@ -20,7 +20,7 @@ default_value_callback: ''
 settings:
  file_directory: page-sons
  file_extensions: 'mp3 ogg'
-  max_filesize: '10 MB'
+  max_filesize: ''
  description_field: false
  handler: 'default:file'
  handler_settings: {  }
@@ -20,7 +20,7 @@ default_value_callback: ''
 settings:
  file_directory: '[date:custom:Y]-[date:custom:m]'
  file_extensions: 'png gif jpg jpeg'
-  max_filesize: ''
+  max_filesize: '10 MB'
  max_resolution: ''
  min_resolution: ''
  alt_field: true
Author	SHA1	Message	Date
bachir	e4b3ca6c94	updated core to 8.52	2018-04-23 21:33:41 +02:00
bachir	0150486358	changed field upload limits	2018-04-23 21:29:31 +02:00
bachir	878e9adeb6	mignified assets for prod	2018-04-23 21:27:29 +02:00
bachir	afac7f57b0	production page can now filter the cospus map	2018-04-23 20:38:32 +02:00
bachir	cd374d7de8	remis les marges hautes et basses sur la carte corpus	2018-04-23 16:56:46 +02:00
bachir	56a2f0c21f	mignified assets for prod	2018-04-21 10:28:09 +02:00
bachir	f7e402320e	rewrited the corpus map drawing without virtual canvas pre-rendering as it's blured	2018-04-21 10:27:02 +02:00
bachir	79071bf0cc	improved checkcollision performance	2018-04-20 11:18:05 +02:00