Skip to content

Commit 4b29301

Browse files
committed
2.3.6 release
1 parent c5b04d6 commit 4b29301

10 files changed

+19
-15
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## 2.3.6 (Sep 11, 2019)
4+
5+
* reverted grid item w and h previous rounding change, fixes #355
6+
37
## 2.3.5 (Sep 7, 2019)
48

59
* Fix: no-touch on mobile and only if item is draggable or resizable (thanks [DGoms](https://github.com/DGoms)).

README-zh_CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
vue-grid-layout是一个类似于[Gridster](http://dsmorse.github.io/gridster.js/)的栅格布局系统, 适用于Vue.js。 **灵感源自于 [React-Grid-Layout](https://github.com/STRML/react-grid-layout)**
88

9-
### **当前版本:** 2.3.4 (支持 Vue 2.2+)
9+
### **当前版本:** 2.3.6 (支持 Vue 2.2+)
1010

1111
### **Vue 2.1.10 及以下请使用 [2.1.3](https://github.com/jbaysolutions/vue-grid-layout/tree/2.1.3)**
1212
### **Vue 1 请使用 [1.0.3](https://github.com/jbaysolutions/vue-grid-layout/tree/1.0.3)**

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
vue-grid-layout is a grid layout system, like [Gridster](http://dsmorse.github.io/gridster.js/), for Vue.js. **Heavily inspired in [React-Grid-Layout](https://github.com/STRML/react-grid-layout)**
88

9-
### **Current version:** 2.3.5 (Supports Vue 2.2+)
9+
### **Current version:** 2.3.6 (Supports Vue 2.2+)
1010

1111
### **For Vue 2.1.10 and below use version [2.1.3](https://github.com/jbaysolutions/vue-grid-layout/tree/2.1.3)**
1212
### **For Vue 1 use version [1.0.3](https://github.com/jbaysolutions/vue-grid-layout/tree/1.0.3)**

dist/vue-grid-layout.common.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4425,12 +4425,12 @@ var web_dom_iterable = __webpack_require__("ac6a");
44254425
var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__("8bbf");
44264426
var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_);
44274427

4428-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"4e668661-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/GridItem.vue?vue&type=template&id=44a6ef42&
4428+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"4e668661-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/GridItem.vue?vue&type=template&id=1dcc0fd5&
44294429
var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{ref:"item",staticClass:"vue-grid-item",class:_vm.classObj,style:(_vm.style)},[_vm._t("default"),(_vm.resizableAndNotStatic)?_c('span',{ref:"handle",class:_vm.resizableHandleClass}):_vm._e()],2)}
44304430
var staticRenderFns = []
44314431

44324432

4433-
// CONCATENATED MODULE: ./src/components/GridItem.vue?vue&type=template&id=44a6ef42&
4433+
// CONCATENATED MODULE: ./src/components/GridItem.vue?vue&type=template&id=1dcc0fd5&
44344434

44354435
// EXTERNAL MODULE: ./node_modules/core-js/modules/es6.regexp.match.js
44364436
var es6_regexp_match = __webpack_require__("4917");
@@ -6018,8 +6018,8 @@ var interact = __webpack_require__("fb3a");
60186018
// ...
60196019
// w = (width + margin) / (colWidth + margin)
60206020

6021-
var w = Math.ceil((width + this.margin[0]) / (colWidth + this.margin[0]));
6022-
var h = Math.ceil((height + this.margin[1]) / (this.rowHeight + this.margin[1])); // Capping
6021+
var w = Math.round((width + this.margin[0]) / (colWidth + this.margin[0]));
6022+
var h = Math.round((height + this.margin[1]) / (this.rowHeight + this.margin[1])); // Capping
60236023

60246024
w = Math.max(Math.min(w, this.cols - this.innerX), 0);
60256025
h = Math.max(Math.min(h, this.maxRows - this.innerY), 0);

dist/vue-grid-layout.common.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vue-grid-layout.umd.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4434,12 +4434,12 @@ var web_dom_iterable = __webpack_require__("ac6a");
44344434
var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__("8bbf");
44354435
var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_);
44364436

4437-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"4e668661-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/GridItem.vue?vue&type=template&id=44a6ef42&
4437+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"4e668661-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/GridItem.vue?vue&type=template&id=1dcc0fd5&
44384438
var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{ref:"item",staticClass:"vue-grid-item",class:_vm.classObj,style:(_vm.style)},[_vm._t("default"),(_vm.resizableAndNotStatic)?_c('span',{ref:"handle",class:_vm.resizableHandleClass}):_vm._e()],2)}
44394439
var staticRenderFns = []
44404440

44414441

4442-
// CONCATENATED MODULE: ./src/components/GridItem.vue?vue&type=template&id=44a6ef42&
4442+
// CONCATENATED MODULE: ./src/components/GridItem.vue?vue&type=template&id=1dcc0fd5&
44434443

44444444
// EXTERNAL MODULE: ./node_modules/core-js/modules/es6.regexp.match.js
44454445
var es6_regexp_match = __webpack_require__("4917");
@@ -6027,8 +6027,8 @@ var interact = __webpack_require__("fb3a");
60276027
// ...
60286028
// w = (width + margin) / (colWidth + margin)
60296029

6030-
var w = Math.ceil((width + this.margin[0]) / (colWidth + this.margin[0]));
6031-
var h = Math.ceil((height + this.margin[1]) / (this.rowHeight + this.margin[1])); // Capping
6030+
var w = Math.round((width + this.margin[0]) / (colWidth + this.margin[0]));
6031+
var h = Math.round((height + this.margin[1]) / (this.rowHeight + this.margin[1])); // Capping
60326032

60336033
w = Math.max(Math.min(w, this.cols - this.innerX), 0);
60346034
h = Math.max(Math.min(h, this.maxRows - this.innerY), 0);

dist/vue-grid-layout.umd.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vue-grid-layout.umd.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vue-grid-layout.umd.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-grid-layout",
3-
"version": "2.3.5",
3+
"version": "2.3.6",
44
"description": "A draggable and resizable grid layout, as a Vue component.",
55
"keywords": [
66
"grid",

0 commit comments

Comments
 (0)