Merge pull request #1 from Tuch/master

Sync with the Tuch origin
mih-kopylov · Sep 1, 2015 · 3432fa6 · 3432fa6
2 parents e6d548f + 15112ff
commit 3432fa6
Show file tree

Hide file tree

Showing 13 changed files with 207 additions and 163 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,27 @@
 # [Changes]
 
+## v0.1.16
+* **angular.element(...).dndCloneByStyles
+  * Fix bug with ignore text nodes
+* **dnd-rect
+  * Fix bug if dnd-rect attr is getter function
+* **
+
+## v0.1.15
+* **dnd-selectable
+  * In case if function return false the value will remain the same. - DEPRECATED
+* **
+
+## v0.1.14
+* **bug-fixes
+  * Fixed bug with touch manipulator and dnd-rect directive
+* **
+
+## v0.1.13
+* **bug-fixes
+  * Fixed a bug with the sequence of events call (leave -> enter -> over)
+* **
+
 ## v0.1.12
 * **bug-fixes
   * Fix bug with child elements of dnd-pointer-none

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Angular-DND 0.1.12
+Angular-DND 0.1.16
 =========
 
 Features:
@@ -117,10 +117,10 @@ Use manipulator to select elements, individually or in a group.
  - dnd-lasso-area как родительский элемент
 
 #### watching attributes:
- - dnd-on-selected [function([$keyPressed])]: interrupt BEFORE changing selected value (dnd-model-selected) from false to true. In case if function return false the value will remain the same.
- - dnd-on-unselected [function([$keyPressed])]: interrupt BEFORE changing selected value (dnd-model-selected) c true на false. In case if function return false the value will remain the same.
- - dnd-on-selecting [function([$keyPressed])]: interrupt BEFORE changing  selecting value (dnd-model-selecting) c false на true. In case if function return false the value will remain the same.
- - dnd-on-unselecting [function([$keyPressed])]: interrupt BEFORE changing selecting value (dnd-model-selecting) c true на false. In case if function return false the value will remain the same.
+ - dnd-on-selected [function([$keyPressed])]: interrupt after changing selected value (dnd-model-selected) from false to true.
+ - dnd-on-unselected [function([$keyPressed])]: interrupt after changing selected value (dnd-model-selected) from true на false.
+ - dnd-on-selecting [function([$keyPressed])]: interrupt after changing  selecting value (dnd-model-selecting) from false на true.
+ - dnd-on-unselecting [function([$keyPressed])]: interrupt after changing selecting value (dnd-model-selecting) from true на false.
 
 #### model attributes:
  - dnd-model-selected: varibale name of selected state
@@ -190,7 +190,17 @@ Examples
 ---------
 
 - All examples inside demo folder
-- Also available [link](http://tuch.github.io/angular-dnd/latest/demo)
+- Also available [link](http://tuch.github.io/angular-dnd/demo)
+
+
+
+
+
+Plunkers
+---------
+- [many drop zones](http://embed.plnkr.co/tdBHyg032OEK3Kn8ZQZw/preview)
+- [custom sortables](http://embed.plnkr.co/ElwZjFIQh3N2HHe18Gse/preview)
+- [useAsPointExample](http://plnkr.co/edit/sQqhYVlZwd2VxGTGoEA8?p=preview)
 
 
 TODO:

diff --git a/README_RU.md b/README_RU.md
@@ -1,4 +1,4 @@
-Angular-DND 0.1.12
+Angular-DND 0.1.16
 =========
 
 Особенности:
@@ -117,10 +117,10 @@ Angular-DND 0.1.12
  - dnd-lasso-area как родительский элемент
 
 #### watching attributes:
- - dnd-on-selected [function([$keyPressed])]: срабатывает ПЕРЕД изменением значения selected (dnd-model-selected) c false на true. В случае если функция вернет false значение останется прежним.
- - dnd-on-unselected [function([$keyPressed])]: срабатывает ПЕРЕД изменениеми значения selected (dnd-model-selected) c true на false. В случае если функция вернет false значение останется прежним.
- - dnd-on-selecting [function([$keyPressed])]: срабатывает ПЕРЕД изменением значения selecting (dnd-model-selecting) c false на true. В случае если функция вернет false значение останется прежним.
- - dnd-on-unselecting [function([$keyPressed])]: срабатывает ПЕРЕД изменением значения selecting (dnd-model-selecting) c true на false. В случае если функция вернет false значение останется прежним.
+ - dnd-on-selected [function([$keyPressed])]: срабатывает после изменением значения selected (dnd-model-selected) c false на true.
+ - dnd-on-unselected [function([$keyPressed])]: срабатывает после изменениеми значения selected (dnd-model-selected) c true на false.
+ - dnd-on-selecting [function([$keyPressed])]: срабатывает после изменением значения selecting (dnd-model-selecting) c false на true.
+ - dnd-on-unselecting [function([$keyPressed])]: срабатывает после изменением значения selecting (dnd-model-selecting) c true на false.
 
 #### model attributes:
  - dnd-model-selected: указывается име переменной в scope, в которой хранится состояние selected
@@ -192,7 +192,7 @@ Angular-DND 0.1.12
 ---------
 
 Все примеры внутри в папке Demo.
-Также доступна [ссылка](http://tuch.github.io/angular-dnd/latest/demo)
+Также доступна [ссылка](http://tuch.github.io/angular-dnd/demo)
 
 
 TODO:

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "angular-dnd-module",
-    "version": "0.1.12",
+    "version": "0.1.16",
     "authors": [
         "Afonin A.V. <[email protected]>"
     ],

diff --git a/demo/index.html b/demo/index.html
@@ -59,10 +59,10 @@
         };
 
         this.reset = function(){
-            this.rect = {top:'0', left:'240px', width: '100px', height: '100px', transform: 'matrix(1, 0, 0, 1, 0, 0)'};
-            this.rect2 = {top:'200px', left:'440px', width: '100px', height: '100px', transform: 'matrix(1, 0, 0, 1, 0, 0)'};
-            this.rect3 = {top:'0', left:'440px', width: '100px', height: '100px', transform: 'matrix(1, 0, 0, 1, 0, 0)'};
-            this.rect4 = {top:'200px', left:'240px', width: '100px', height: '100px', transform: 'matrix(1, 0, 0, 1, 0, 0)'};
+            this.rect = {top:'0', left:'240px', width: '100px', height: '100px'};
+            this.rect2 = {top:'200px', left:'440px', width: '100px', height: '100px'};
+            this.rect3 = {top:'0', left:'440px', width: '100px', height: '100px'};
+            this.rect4 = {top:'200px', left:'240px', width: '100px', height: '100px'};
         }
 
         this.reset();
@@ -105,7 +105,7 @@
                  ng-click = "click(!$dragged && !$resized && !$rotated, $dropmodel)"
 
                  dnd-draggable = "true"
-                 dnd-draggable-opts = "{layer: 'layer1', useAsPoint: true }"
+                 dnd-draggable-opts = "{layer: 'layer1' }"
                  dnd-on-dragstart = "main.dragstart($dropmodel, $dragmodel)"
                  dnd-on-drag = "main.drag($dropmodel, $dragmodel)"
                  dnd-on-dragend = "main.dragend($dropmodel, $dragmodel)"