Explorar el Código

[minor] fixed jquery drag event

version-14
Rushabh Mehta hace 11 años
padre
commit
78a519ed5e
Se han modificado 3 ficheros con 9 adiciones y 7 borrados
  1. +1
    -1
      public/build.json
  2. +1
    -1
      public/js/lib/slickgrid/jquery.event.drag.js
  3. +7
    -5
      public/js/lib/slickgrid/slick-default-theme.css

+ 1
- 1
public/build.json Ver fichero

@@ -138,7 +138,7 @@
}, },
{ {
"public/js/slickgrid.min.js": [ "public/js/slickgrid.min.js": [
"lib/public/js/lib/slickgrid/jquery.event.drag.min.js",
"lib/public/js/lib/slickgrid/jquery.event.drag.js",
"lib/public/js/lib/slickgrid/plugins/slick.cellrangedecorator.js", "lib/public/js/lib/slickgrid/plugins/slick.cellrangedecorator.js",
"lib/public/js/lib/slickgrid/plugins/slick.cellrangeselector.js", "lib/public/js/lib/slickgrid/plugins/slick.cellrangeselector.js",
"lib/public/js/lib/slickgrid/plugins/slick.cellselectionmodel.js", "lib/public/js/lib/slickgrid/plugins/slick.cellselectionmodel.js",


public/js/lib/slickgrid/jquery.event.drag.min.js → public/js/lib/slickgrid/jquery.event.drag.js Ver fichero

@@ -178,7 +178,7 @@ drag = $special.drag = {
case !dd.dragging && 'touchmove': case !dd.dragging && 'touchmove':
event.preventDefault(); event.preventDefault();
case !dd.dragging && 'mousemove': case !dd.dragging && 'mousemove':
// drag tolerance, x² + y² = distance²
// drag tolerance, x≤ + y≤ = distance≤
if ( Math.pow( event.pageX-dd.pageX, 2 ) + Math.pow( event.pageY-dd.pageY, 2 ) < Math.pow( dd.distance, 2 ) ) if ( Math.pow( event.pageX-dd.pageX, 2 ) + Math.pow( event.pageY-dd.pageY, 2 ) < Math.pow( dd.distance, 2 ) )
break; // distance tolerance not reached break; // distance tolerance not reached
event.target = dd.target; // force target from "mousedown" event (fix distance issue) event.target = dd.target; // force target from "mousedown" event (fix distance issue)

+ 7
- 5
public/js/lib/slickgrid/slick-default-theme.css Ver fichero

@@ -6,17 +6,16 @@ classes should alter those!
*/ */


.slick-header-columns { .slick-header-columns {
background: url('../lib/js/lib/slickgrid/images/header-columns-bg.gif') repeat-x center bottom;
background-color: #f2f2f2;
border-bottom: 1px solid silver; border-bottom: 1px solid silver;
} }


.slick-header-column { .slick-header-column {
background: url('../lib/js/lib/slickgrid/images/header-columns-bg.gif') repeat-x center bottom;
border-right: 1px solid silver; border-right: 1px solid silver;
} }


.slick-header-column:hover, .slick-header-column-active { .slick-header-column:hover, .slick-header-column-active {
background: white url('../lib/js/lib/slickgrid/images/header-columns-over-bg.gif') repeat-x center bottom;
background-color: #f5f5f5;
} }


.slick-headerrow { .slick-headerrow {
@@ -46,8 +45,7 @@ classes should alter those!
} }


.slick-cell { .slick-cell {
padding-left: 4px;
padding-right: 4px;
padding: 0px 4px;
} }


.slick-group { .slick-group {
@@ -90,6 +88,10 @@ classes should alter those!
background: #fafafa; background: #fafafa;
} }


.slick-row.odd .slick-cell {
background-color: #f9f9f9;
}

.slick-row.ui-state-active { .slick-row.ui-state-active {
background: #F5F7D7; background: #F5F7D7;
} }


Cargando…
Cancelar
Guardar