Merge pull request #140 from symfony-cmf/fix_dnd

do not stop events any more, just deactivate

Author: ElectricMaxxx

.travis.yml

@@ -5,33 +5,44 @@ php:
   - 7.0
   - 7.1
 
-sudo: false
+sudo: required
+dist: trusty
 
 cache:
     directories:
         - $HOME/.composer/cache/files
 # node_modules are not cached, because we don't shrinkwrap the deps.
 #        - node_modules
 
-env: LANG=php
+env:
+  - LANG=php
+  - NODE_RELEASE=6.x
 
 matrix:
   include:
     - php: 5.6
-      env: LANG=js
+      env:
+        - LANG=js
+        - NODE_RELEASE=6.x
+  exclude:
+    - php: 5.6
+      env: NODE_RELEASE=6.x
+    - php: 7.0
+      env: NODE_RELEASE=6.x
+    - php: 7.1
+      env: NODE_RELEASE=6.x
   fast_finish: true
 
 before_install:
   - if [ "$LANG" = "php" ]; then phpenv config-rm xdebug.ini || true; fi
-  - if [ "$LANG" = "js" ]; then npm install -g bower && npm set progress=false; fi
 
 install:
-  - if [ "$LANG" = "js" ]; then npm install; bower install; fi
+  - if [ "$LANG" = "js" ]; then npm run travis:install; fi
   - if [ "$LANG" = "php" ]; then composer update --prefer-dist; fi
 
 script:
   - if [ "$LANG" = "js" ]; then npm test; fi
-  - if [ "$LANG" = "php" ]; then phpunit; fi
+  - if [ "$LANG" = "php" ]; then vendor/bin/simple-phpunit; fi
 
 notifications:
   irc: "irc.freenode.org#symfony-cmf"

composer.json

@@ -16,7 +16,8 @@
         "symfony-cmf/resource-rest-bundle": "1.0.*"
     },
     "require-dev": {
-        "symfony/form": "^2.8|^3.0"
+        "symfony/form": "^2.8|^3.0",
+        "symfony/phpunit-bridge": "^3.2"
     },
     "minimum-stability": "RC",
     "prefer-stable": true,

karma.conf.js

@@ -48,7 +48,7 @@ module.exports = function(config) {
     reporters: ['dots'],
 
     webpack: webpackConfig,
-    webpackMiddleware: { noInfo: true },
+    webpackMiddleware: { noInfo: true, stats: 'errors-only'},
 
     // web server port
     port: 9876,

package.json

@@ -24,6 +24,9 @@
     "webpack": "^1.12.9"
   },
   "scripts": {
+    "update:nodejs": "sudo rm -rf ~/.nvm - curl -sL 'https://deb.nodesource.com/setup_${NODE_RELEASE}' | sudo -E bash && sudo apt-get install -y nodejs",
+    "pretravis:install": "npm run update:nodejs && npm install -g bower && npm set progress=false",
+    "travis:install": "npm install && bower install",
     "test": "\"node_modules/karma/bin/karma\" start --single-run --browsers PhantomJS",
     "build": "sh _build.sh"
   },

src/Resources/assets/js/adapter/fancytree.js

@@ -295,9 +295,10 @@ export class FancytreeAdapter {
         };
 
         // We do not want to do anything on activation atm.
-        this.$tree.fancytree('option', 'beforeActivate', (event, data) => {
+        this.$tree.fancytree('option', 'activate', (event, data) => {
             if (!this.boundToInput) {
-                return false;
+                data.node.setActive(false);
+                data.node.setFocus(false);
             }
         });
     }