@@ -1086,7 +1086,7 @@ $.ui.plugin.add( "draggable", "snap", {
1086
1086
$ ( o . snap . constructor !== String ? ( o . snap . items || ":data(ui-draggable)" ) : o . snap )
1087
1087
. each ( function ( ) {
1088
1088
var $t = $ ( this ) ,
1089
- $o = $t . offset ( ) ;
1089
+ $o = i . _convertPositionTo ( "relative" , $t . offset ( ) ) ;
1090
1090
if ( this !== i . element [ 0 ] ) {
1091
1091
i . snapElements . push ( {
1092
1092
item : this ,
@@ -1102,8 +1102,9 @@ $.ui.plugin.add( "draggable", "snap", {
1102
1102
var ts , bs , ls , rs , l , r , t , b , i , first ,
1103
1103
o = inst . options ,
1104
1104
d = o . snapTolerance ,
1105
- x1 = ui . offset . left , x2 = x1 + inst . helperProportions . width ,
1106
- y1 = ui . offset . top , y2 = y1 + inst . helperProportions . height ;
1105
+ p = inst . _convertPositionTo ( "relative" , ui . offset ) ,
1106
+ x1 = p . left , x2 = x1 + inst . helperProportions . width ,
1107
+ y1 = p . top , y2 = y1 + inst . helperProportions . height ;
1107
1108
1108
1109
for ( i = inst . snapElements . length - 1 ; i >= 0 ; i -- ) {
1109
1110
@@ -1133,28 +1134,16 @@ $.ui.plugin.add( "draggable", "snap", {
1133
1134
ls = Math . abs ( l - x2 ) <= d ;
1134
1135
rs = Math . abs ( r - x1 ) <= d ;
1135
1136
if ( ts ) {
1136
- ui . position . top = inst . _convertPositionTo ( "relative" , {
1137
- top : t - inst . helperProportions . height ,
1138
- left : 0
1139
- } ) . top ;
1137
+ ui . position . top = t - inst . helperProportions . height ;
1140
1138
}
1141
1139
if ( bs ) {
1142
- ui . position . top = inst . _convertPositionTo ( "relative" , {
1143
- top : b ,
1144
- left : 0
1145
- } ) . top ;
1140
+ ui . position . top = b ;
1146
1141
}
1147
1142
if ( ls ) {
1148
- ui . position . left = inst . _convertPositionTo ( "relative" , {
1149
- top : 0 ,
1150
- left : l - inst . helperProportions . width
1151
- } ) . left ;
1143
+ ui . position . left = l - inst . helperProportions . width ;
1152
1144
}
1153
1145
if ( rs ) {
1154
- ui . position . left = inst . _convertPositionTo ( "relative" , {
1155
- top : 0 ,
1156
- left : r
1157
- } ) . left ;
1146
+ ui . position . left = r ;
1158
1147
}
1159
1148
}
1160
1149
@@ -1166,28 +1155,16 @@ $.ui.plugin.add( "draggable", "snap", {
1166
1155
ls = Math . abs ( l - x1 ) <= d ;
1167
1156
rs = Math . abs ( r - x2 ) <= d ;
1168
1157
if ( ts ) {
1169
- ui . position . top = inst . _convertPositionTo ( "relative" , {
1170
- top : t ,
1171
- left : 0
1172
- } ) . top ;
1158
+ ui . position . top = t ;
1173
1159
}
1174
1160
if ( bs ) {
1175
- ui . position . top = inst . _convertPositionTo ( "relative" , {
1176
- top : b - inst . helperProportions . height ,
1177
- left : 0
1178
- } ) . top ;
1161
+ ui . position . top = b - inst . helperProportions . height ;
1179
1162
}
1180
1163
if ( ls ) {
1181
- ui . position . left = inst . _convertPositionTo ( "relative" , {
1182
- top : 0 ,
1183
- left : l
1184
- } ) . left ;
1164
+ ui . position . left = l ;
1185
1165
}
1186
1166
if ( rs ) {
1187
- ui . position . left = inst . _convertPositionTo ( "relative" , {
1188
- top : 0 ,
1189
- left : r - inst . helperProportions . width
1190
- } ) . left ;
1167
+ ui . position . left = r - inst . helperProportions . width ;
1191
1168
}
1192
1169
}
1193
1170
0 commit comments