Skip to content
This repository has been archived by the owner on Nov 27, 2019. It is now read-only.

Commit

Permalink
merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
luckylooke committed Feb 18, 2018
2 parents dc07d6e + e9100c0 commit 95ea5f3
Show file tree
Hide file tree
Showing 7 changed files with 138 additions and 138 deletions.
258 changes: 129 additions & 129 deletions docs/dist/examples.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/dist/examples.js
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,7 @@ return /******/ (function(modules) { // webpackBootstrap
return;
}

if ( reference === null ||
if ( (reference === null && changed) ||
reference !== shared.item &&
reference !== nextEl( shared.item ) &&
reference !== shared.currentSibling ) {
Expand Down Expand Up @@ -2994,8 +2994,8 @@ return /******/ (function(modules) { // webpackBootstrap
$templateCache.put("exampleBasic/exampleBasic.html","<div class=\'parent\'>\n <h2>Basic</h2>\n <label>Move stuff between these two containers. Note how the stuff gets inserted near the mouse pointer? Great stuff.</label>\n <div class=\'wrapper\' ng-controller=\"Basic\">\n <div class=\'containerVertical\'>\n <div>Move me, but you can only drop me in one of these containers.</div>\n <div>If you try to drop me somewhere other than these containers, I\'ll just come back.</div>\n <div>Item 3.</div>\n <div>Item 6.</div>\n </div>\n <div class=\'containerVertical\'>\n <div>You can drop me in the left container, otherwise I\'ll stay here.</div>\n <div ng-click=\"clicked = !clicked\" ng-class=\"clicked && \'clickedClass\'\">Try to click me, dragular distinguish drag from click</div>\n <div>Item 5.</div>\n </div>\n </div>\n <pre>\n <code>\n// JS\n controller(\'Basic\', [\'$element\', \'dragularService\', function TodoCtrl($element, dragularService) {\n dragularService(\'.containerVertical\');\n }])\n </code>\n <code>\n// CSS\n.clickedClass {\n background-color: orange !important;\n}\n </code>\n <code>\n&lt;!-- HTML --&gt;\n &lt;div class=\'wrapper\' ng-controller=&quot;Basic&quot;&gt;\n &lt;div class=\'containerVertical\'&gt;\n &lt;div&gt;Move me, but you can only drop me in one of these containers.&lt;/div&gt;\n &lt;div&gt;If you try to drop me somewhere other than these containers, I\'ll just come back.&lt;/div&gt;\n &lt;div&gt;Item 3.&lt;/div&gt;\n &lt;div&gt;Item 6.&lt;/div&gt;\n &lt;/div&gt;\n &lt;div class=\'containerVertical\'&gt;\n &lt;div&gt;You can drop me in the left container, otherwise I\'ll stay here.&lt;/div&gt;\n &lt;div ng-click=\"clicked = !clicked\" ng-class=\"clicked && \'clickedClass\'\"&gt;Try to click me, dragular distinguish drag from click&lt;/div&gt;\n &lt;div&gt;Item 5.&lt;/div&gt;\n &lt;/div&gt;\n&lt;/div&gt;\n </code>\n </pre>\n</div>\n");
$templateCache.put("exampleBasicWithModel/exampleBasicWithModel.html","<div class=\'parent\'>\n <h2>Basic - with model</h2>\n <label>Move stuff between these two containers. Note how the stuff gets inserted near the mouse pointer? Great stuff.</label>\n <div class=\'wrapper\' ng-controller=\"BasicModel\">\n <div class=\'tableRow\'>\n <div class=\'containerVertical\'>\n <div ng-repeat=\"item in items1\">{{item.content}}</div>\n </div>\n <div class=\'containerVertical\' id=\"test\">\n <div ng-repeat=\"item in items2\">{{item.content}}</div>\n </div>\n </div>\n <div class=\"tableRow\">\n <div class=\'containerVertical\'>\n <pre>Items1:\n <br/>{{items1 | json}}</pre>\n </div>\n <div class=\'containerVertical\'>\n <pre>Items2:\n <br/>{{items2 | json}}</pre>\n </div>\n </div>\n </div>\n <pre>\n <code>\n// JS\n controller(\'BasicModel\', [\'$scope\', \'$element\', \'dragularService\', function TodoCtrl($scope, $element, dragularService) {\n $scope.items1 = [{\n content: \'Move me, but you can only drop me in one of these containers.\'\n }, {\n content: \'If you try to drop me somewhere other than these containers, I\\\'ll just come back.\'\n }, {\n content: \'Item 3\'\n }, {\n content: \'Item 4\'\n }];\n $scope.items2 = [{\n content: \'Item 5\'\n }, {\n content: \'Item 6\'\n }, {\n content: \'Item 7\'\n }, {\n content: \'Item 8\'\n }];\n var containers = $element.children().children();\n dragularService([containers[0],containers[1]],{\n containersModel: [$scope.items1, $scope.items2]\n });\n }])\n </code>\n <code>\n&lt;!-- HTML --&gt;\n&lt;div class=\'wrapper\' ng-controller=&quot;Basic&quot;&gt;\n &lt;div class=\'tableRow\'&gt;\n &lt;div class=\'containerVertical\'&gt;\n &lt;div ng-repeat=&quot;item in items1&quot;&gt;{{item.content}}&lt;/div&gt;\n &lt;/div&gt;\n &lt;div class=\'containerVertical\'&gt;\n &lt;div ng-repeat=&quot;item in items2&quot;&gt;{{item.content}}&lt;/div&gt;\n &lt;/div&gt;\n &lt;/div&gt;\n &lt;div class=&quot;tableRow&quot;&gt;\n &lt;div class=&quot;container&quot;&gt;\n &lt;div&gt;Items1:\n &lt;br/&gt;{{items1 | json}}&lt;/div&gt;\n &lt;/div&gt;\n &lt;div class=&quot;container&quot;&gt;\n &lt;div&gt;Items2:\n &lt;br/&gt;{{items2 | json}}&lt;/div&gt;\n &lt;/div&gt;\n &lt;/div&gt;\n&lt;/div&gt;\n </code>\n </pre>\n</div>\n");
$templateCache.put("exampleBoundingBox/exampleBoundingBox.html"," <div class=\'parent\'>\n <h2>BoundingBox</h2>\n <label>You can provide element in options.boundingBox to limit crossing element borders.</label>\n <div class=\'wrapper\' ng-controller=\"BoundingBox\">\n <div class=\'containerVertical\'>\n <div>This items cannot cross its example element, just try it your selves.</div>\n <div>Item 2.</div>\n <div>Item 3.</div>\n <div>Item 6.</div>\n </div>\n <div class=\'containerVertical\'>\n <div>This items cannot cross its example element, just try it your selves.</div>\n <div>Item 4.</div>\n <div>Item 5.</div>\n </div>\n </div>\n <pre>\n <code>\n dragularService([$element.children(), {\n boundingBox: $element\n });\n </code>\n </pre>\n </div>");
$templateCache.put("exampleBoundingBoxLockX/exampleBoundingBoxLockX.html","<div class=\'parent\'>\n <h2>BoundingBox and lockX</h2>\n <label>Movement can be locked to X or Y axis and also you can provide element in options.boundingBox to limit crossing element borders.</label>\n <div class=\'wrapper\' ng-controller=\"BoundingBoxLockX\">\n <div class=\'containerHorizontal\'>\n <div class=\'boundingBox\'>\n <div class=\"width25\">Items are locked in X axis movement and cannot cross its closest parent div.boundingBox, just try it your selves.</div>\n <div class=\"width25\">item 2</div>\n <div class=\"width25\">item 3</div>\n <div class=\"width25\">item 4</div>\n </div>\n </div>\n </div>\n <pre>\n <code>\n dragularService([$element.children()[0].children(), {\n boundingBox: $element.children()[0],\n lockX: true\n });\n </code>\n </pre>\n </div>");
$templateCache.put("exampleBoundingBoxLockY/exampleBoundingBoxLockY.html"," <div class=\'parent\'>\n <h2>BoundingBox and LockY</h2>\n <label>Movement can be locked to X or Y axis and also you can provide element in options.boundingBox to limit crossing element borders.</label>\n <div class=\'wrapper\' ng-controller=\"BoundingBoxLockY\">\n <div class=\'containerVertical\'>\n <div class=\'boundingBox\'>\n <div>Items are locked in Y axis movement and cannot cross its closest parent div.boundingBox, just try it your selves.</div>\n <div>item 2</div>\n <div>item 3</div>\n <div>item 4</div>\n <div>item 5</div>\n <div>item 6</div>\n </div>\n </div>\n </div>\n <pre>\n <code>\n dragularService([$element.children()[0].children(), {\n boundingBox: $element.children()[0],\n lockY: true\n });\n </code>\n </pre>\n </div>");
$templateCache.put("exampleBoundingBoxLockX/exampleBoundingBoxLockX.html","<div class=\'parent\'>\n <h2>BoundingBox and lockX</h2>\n <label>Movement can be locked to X or Y axis and also you can provide element in options.boundingBox to limit crossing element borders.</label>\n <div class=\'wrapper\' ng-controller=\"BoundingBoxLockX\">\n <div class=\'containerHorizontal\'>\n <div class=\'boundingBox\'>\n <div class=\"width25\">Items are locked in X axis movement and cannot cross its closest parent div.boundingBox, just try it your selves.</div>\n <div class=\"width25\">item 2</div>\n <div class=\"width25\">item 3</div>\n <div class=\"width25\">item 4</div>\n </div>\n </div>\n </div>\n <pre>\n <code>\n dragularService([$element.children()[0].children(), {\n boundingBox: $element.children()[0],\n lockX: true\n });\n </code>\n </pre>\n </div>");
$templateCache.put("exampleCopy/exampleCopy.html","<div class=\'parent\'>\n <h2>Copy</h2>\n <label>Copying stuff is great too.</label>\n <div class=\'wrapper\' ng-controller=\"Copy\" ng-hide=\"globals.showModelExamples\">\n <div id=\'left2\' class=\'containerVertical\'>\n <div>Move me, and make copy on drop.</div>\n <div>If you try to drop me somewhere other than these containers, I\'ll just come back.</div>\n </div>\n <div id=\'right2\' class=\'containerVertical\'>\n <div>You can drop me in the left container, otherwise I\'ll stay here.</div>\n </div>\n </div>\n <pre>\n <code>\n// JS\n controller(\'Copy\', [\'$element\', \'dragularService\', function TodoCtrl($element, dragularService) {\n dragularService($element.children(), {\n copy: true\n });\n }])\n </code>\n <code>\n&lt;!-- HTML --&gt;\n&lt;div class=\'wrapper\' ng-controller=&quot;Copy&quot; ng-hide=&quot;globals.showModelExamples&quot;&gt;\n &lt;div id=\'left2\' class=\'containerVertical\'&gt;\n &lt;div&gt;Move me, and make copy on drop.&lt;/div&gt;\n &lt;div&gt;If you try to drop me somewhere other than these containers, I\'ll just come back.&lt;/div&gt;\n &lt;/div&gt;\n &lt;div id=\'right2\' class=\'containerVertical\'&gt;\n &lt;div&gt;You can drop me in the left container, otherwise I\'ll stay here.&lt;/div&gt;\n &lt;/div&gt;\n &lt;/div&gt;\n </code>\n </pre>\n</div>\n");
$templateCache.put("exampleCopyWithModel/exampleCopyWithModel.html","<div class=\'parent\'>\n <h2>Copy - with model</h2>\n <label>Copying stuff is great too.</label>\n <div class=\'wrapper\' ng-controller=\"CopyModel\">\n <div class=\'tableRow\'>\n <div class=\'containerVertical\'>\n <div ng-repeat=\"item in items1\">{{item.content}}</div>\n </div>\n <div class=\'containerVertical\'>\n <div ng-repeat=\"item in items2\">{{item.content}}</div>\n </div>\n </div>\n <div class=\"tableRow\">\n <div class=\'containerVertical\'>\n <div>Items1:\n <pre>\n {{ items1 | json }}\n </pre>\n </div>\n </div>\n <div class=\'containerVertical\'>\n <div>Items2:\n <pre>\n {{ items2 | json }}\n </pre>\n </div>\n </div>\n </div>\n </div>\n <pre>\n <code>\n// JS\n controller(\'CopyModel\', [\'$scope\', \'$element\', \'dragularService\', function TodoCtrl($scope, $element, dragularService) {\n $scope.items1 = [{\n content: \'Move me, and make copy on drop.\'\n }, {\n content: \'If you try to drop me somewhere other than these containers, I\\\'ll just come back.\'\n }, {\n content: \'Item 3\'\n }, {\n content: \'Item 4\'\n }];\n $scope.items2 = [{\n content: \'Item 5\'\n }, {\n content: \'Item 6\'\n }, {\n content: \'Item 7\'\n }, {\n content: \'Item 8\'\n }];\n var containers = $element.children().children();\n dragularService([containers[0],containers[1]],{\n containersModel: [$scope.items1, $scope.items2],\n copy: true\n });\n }])\n </code>\n <code>\n&lt;!-- HTML --&gt;\n&lt;div class=\'wrapper\' ng-controller=&quot;CopyModel&quot; ng-show=&quot;globals.showModelExamples&quot;&gt;\n &lt;div class=\'tableRow\'&gt;\n &lt;div class=\'containerVertical\'&gt;\n &lt;div ng-repeat=&quot;item in items1&quot;&gt;{{item.content}}&lt;/div&gt;\n &lt;/div&gt;\n &lt;div class=\'containerVertical\'&gt;\n &lt;div ng-repeat=&quot;item in items2&quot;&gt;{{item.content}}&lt;/div&gt;\n &lt;/div&gt;\n &lt;/div&gt;\n &lt;div class=&quot;tableRow&quot;&gt;\n &lt;div class=&quot;container&quot;&gt;\n &lt;div&gt;Items1:\n &lt;br/&gt;{{items1 | json}}&lt;/div&gt;\n &lt;/div&gt;\n &lt;div class=&quot;container&quot;&gt;\n &lt;div&gt;Items2:\n &lt;br/&gt;{{items2 | json}}&lt;/div&gt;\n &lt;/div&gt;\n &lt;/div&gt;\n &lt;/div&gt;\n </code>\n </pre>\n</div>\n");
$templateCache.put("exampleCustomClasses/exampleCustomClasses.html","<div class=\'parent\'>\n <h2>Custom classes</h2>\n <label>You can overwrite buildin classes by providing classes names in object via options.classes.</label>\n <div class=\'wrapper\' ng-controller=\"CustomClasses\">\n <div id=\'left4\' class=\'containerVertical\'>\n <div>Move me, but you can only drop me in one of these containers.</div>\n <div>If you try to drop me somewhere other than these containers, I\'ll just come back.</div>\n <div>Item 3.</div>\n <div>Item 6.</div>\n </div>\n <div id=\'right3\' class=\'containerVertical\'>\n <div>You can drop me in the left container, otherwise I\'ll stay here.</div>\n <div>Item 4.</div>\n <div>Item 5.</div>\n </div>\n </div>\n <pre>\n <code>\n dragularService([document.getElementById(left), document.getElementById(right)], { classes: {\n mirror: \'custom-green-mirror\'\n } });\n\n // Default classes are:\n option.classes = {\n mirror: \'gu-mirror\',\n hide: \'gu-hide\',\n unselectable: \'gu-unselectable\',\n transit: \'gu-transit\',\n overActive: \'gu-over-active\',\n overAccepts: \'gu-over-accept\',\n overDeclines: \'gu-over-decline\'\n };\n </code>\n </pre>\n</div>\n");
Expand Down
4 changes: 2 additions & 2 deletions docs/dist/examples.min.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/dist/examples.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/dist/examples.min.js.map

Large diffs are not rendered by default.

Loading

0 comments on commit 95ea5f3

Please sign in to comment.