Merge branch 'dev'

luckylooke · Jun 26, 2017 · 121ae85 · 121ae85
2 parents 2f63d2a + 21c87bc
commit 121ae85
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 19 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "dragular",
-  "version": "4.4.2",
+  "version": "4.4.3",
   "description": "Angular drag and drop library based on dragula, but full featured. For light-weight angular wrap of dragula look for angular-dragula",
   "main": [
     "dist/dragular.js",

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,6 @@
+# 4.4.3 Spy Kids
+- fixed #148 - model not updated on spill
+
 # 4.4.2 The Model
 - fixed #138 - dynamic model via directive doesn't work properly
 

diff --git a/dist/dragular.js b/dist/dragular.js
@@ -60,7 +60,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	var dragularService = __webpack_require__( 2 );
 
 	/**
-	 * Dragular 4.4.2 by Luckylooke https://github.com/luckylooke/dragular
+	 * Dragular 4.4.3 by Luckylooke https://github.com/luckylooke/dragular
 	 * Angular version of dragula https://github.com/bevacqua/dragula
 	 */
 	module.exports = 'dragularModule';
@@ -751,7 +751,12 @@ return /******/ (function(modules) { // webpackBootstrap
 				while ( target && !accepted() ) {
 					target = getParent( target );
 				}
-				shared.targetCtx = targetCtx || {};
+
+				// bugfix #148 model not updated on spill
+				if ( targetCtx ){
+					shared.targetCtx = targetCtx;
+				}
+
 				return target;
 
 				function accepted() {
@@ -965,6 +970,8 @@ return /******/ (function(modules) { // webpackBootstrap
 
 
 			function release( e ) {
+
+				console.log('release');
 				ungrab();
 				if ( !drake.dragging ) {
 					return;

diff --git a/dist/dragular.min.js b/dist/dragular.min.js
diff --git a/dist/dragular.min.js.map b/dist/dragular.min.js.map
diff --git a/docs/dist/examples.js b/docs/dist/examples.js
diff --git a/docs/dist/examples.min.js b/docs/dist/examples.min.js
diff --git a/docs/dist/examples.min.js.map b/docs/dist/examples.min.js.map
diff --git a/docs/src/examples/partials/autogenerated/contribute.html b/docs/src/examples/partials/autogenerated/contribute.html
@@ -6,7 +6,7 @@ <h2 id="reporting-issues">Reporting issues</h2>
 <p><strong>1. Search for existing issues.</strong> Your bug may have already been fixed or addressed in a development branch version of Dragular, so be sure to search the issues first before putting in a duplicate issue.</p>
 <p><strong>2. Not sure if it&#39;s a bug?.</strong> Then please ask via issues and tag it [question].</p>
 <p><strong>3. Create an isolated and reproducible test case.</strong> If you are reporting a bug, make sure you also have a minimal, runnable, code example that reproduces the problem you have.</p>
-<p><strong>4. Include a live example.</strong> After narrowing your code down to only the problem areas, make use of <a href="http://jsfiddle.net">jsFiddle</a>, <a href="http://jsbin.com/">jsBin</a>, or a link to your live site so that we can view a live example of the problem. (you can start by forking <a href="http://jsfiddle.net/luckylooke/afv234uh/4/">this fiddle</a>)</p>
+<p><strong>4. Include a live example.</strong> After narrowing your code down to only the problem areas, make use of <a href="http://codepen.io">Codepen</a>, <a href="http://jsbin.com/">jsBin</a>, or a link to your live site so that we can view a live example of the problem. (you can start by forking <a href="https://codepen.io/luckylooke/pen/pPmeWY">this codepen</a>)</p>
 <p><strong>5. Share as much information as possible.</strong> Include browser version affected, your OS, version of the library, steps to reproduce, etc. &quot;X isn&#39;t working!!!1!&quot; will probably just be closed.</p>
 <h2 id="dev-vs-master">Dev vs. Master</h2>
 <p>The dev branch of Dragular is our &#39;current working&#39; version. It is always ahead of the master branch in terms of features and fixes. However it&#39;s also bleeding-edge and experimental and we cannot and do not guarantee it will compile or work for you. Very often we have to break things for a few days while we rebuild and patch. So by all means please export the dev branch and contribute towards it, indeed that is where all Pull Requests should be sent, but do so understanding the API may change beneath you.</p>

diff --git a/docs/src/examples/partials/partial-home.html b/docs/src/examples/partials/partial-home.html
@@ -12,7 +12,7 @@ <h1>DRAGULAR</h1>
           <p>Browser support includes every sane browser and **IE7+**. <sub>_(Granted you polyfill the functional `Array` methods in ES5)_</sub></p>
           <h2>Inspiration</h2>
           <p>I am working on huge angular project and I am using several drag&drop libraries in it, one for UI, one for lists, etc.. I want to use one full-featured drag&drop library for whole project. As I could not find any suitable, I decided to create one. I have choosen great library <a href="http://github.com/bevacqua/dragula">dragula</a> by <a href="https://github.com/bevacqua">Nicolas Bevacqua</a> as my starting point, make it more angular and started to put features in it! If you wish light-weight angular version of dragula, there is <a href="http://github.com/bevacqua/angular-dragula">official angular version of dragula</a>.</p>
-          <p><b>Actual version 4.4.2 is based on dragula 3.6.3 and tested with angular 1.5.5.</b></p>
+          <p><b>Actual version 4.4.3 is based on dragula 3.6.3 and tested with angular 1.5.5.</b></p>
           <h2>Differences of dragular (against dragula)</h2>
           <ul>
             <li>replaced dragula crossvent with angulars event binding</li>

diff --git a/docs/src/examples/templates.js b/docs/src/examples/templates.js
diff --git a/readme.md b/readme.md
@@ -13,7 +13,7 @@ Browser support includes every sane browser and **IE7+**. <sub>_(Granted you pol
 
 I was working on huge angular project and I was using several drag&drop libraries in it, one for UI, one for lists, etc.. I wanted to use one full-featured drag&drop library for whole project. As I could not find any suitable, I decided to create one. I have choosen great library [dragula](http://github.com/bevacqua/dragula) by [Nicolas Bevacqua](http://github.com/bevacqua) as my starting point, make it more angular and started to put features in it! If you wish light-weight angular version of dragula, there is [official angular version of dragula](http://github.com/bevacqua/angular-dragula).
 
-<b>Actual version 4.4.2 is based on dragula 3.6.3 and tested with angular 1.5.5.</b>
+<b>Actual version 4.4.3 is based on dragula 3.6.3 and tested with angular 1.5.5.</b>
 
 # Differences of dragular (against dragula)
 

diff --git a/src/dragularModule.js b/src/dragularModule.js
@@ -4,7 +4,7 @@ var dragularDirective = require( './dragularDirective' );
 var dragularService = require( './dragularService' );
 
 /**
- * Dragular 4.4.2 by Luckylooke https://github.com/luckylooke/dragular
+ * Dragular 4.4.3 by Luckylooke https://github.com/luckylooke/dragular
  * Angular version of dragula https://github.com/bevacqua/dragula
  */
 module.exports = 'dragularModule';

diff --git a/src/dragularService.js b/src/dragularService.js
@@ -623,7 +623,12 @@ var dragularService = function ( $rootScope, $compile ) {
 			while ( target && !accepted() ) {
 				target = getParent( target );
 			}
-			shared.targetCtx = targetCtx || {};
+
+			// bugfix #148 model not updated on spill
+			if ( targetCtx ){
+				shared.targetCtx = targetCtx;
+			}
+
 			return target;
 
 			function accepted() {
@@ -837,6 +842,8 @@ var dragularService = function ( $rootScope, $compile ) {
 
 
 		function release( e ) {
+
+			console.log('release');
 			ungrab();
 			if ( !drake.dragging ) {
 				return;