Commit 6ac4ef3 1 parent 8cf6f55 commit 6ac4ef3 Copy full SHA for 6ac4ef3
File tree 3 files changed +7
-10
lines changed
portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus
reference/library/src/morpheus-master
3 files changed +7
-10
lines changed Original file line number Diff line number Diff line change 82
82
document.write('\x3Cscript src="${pageWebjarsPath}bootstrap/3.3.7/js/bootstrap.min.js$!{portalCDNQuery}">'+'\x3C/script>')
83
83
document.write('\x3Cscript src="${pageWebjarsPath}jquery-ui/1.11.3/jquery-ui.min.js$!{portalCDNQuery}">'+'\x3C/script>')
84
84
document.write('\x3Clink rel="stylesheet" href="${pageWebjarsPath}jquery-ui/1.11.3/jquery-ui.min.css$!{portalCDNQuery}"/>')
85
+ if (Modernizr.touch) {
86
+ document.write('\x3Cscript type="text/javascript" src="${pageWebjarsPath}jquery-ui-touch-punch/0.2.3/jquery.ui.touch-punch.min.js$!{portalCDNQuery}">'+'\x3C/script>')
87
+ }
85
88
window.console && console.log('Portal scripts loaded JQ+MI+BS+UI');
86
89
} else {
87
90
if (typeof jQuery.migrateWarnings == 'undefined') {
Original file line number Diff line number Diff line change @@ -525,25 +525,22 @@ $PBJQ(document).ready(function($){
525
525
var favoriteItem = itemsBySiteId [ siteid ] . clone ( false ) ;
526
526
527
527
favoriteItem . addClass ( 'organize-favorite-item' ) . data ( 'site-id' , siteid ) ;
528
- var dragHandle = $PBJQ ( '<i class="fa fa-bars fav-drag-handle "></i>' ) ;
528
+ var dragHandle = $PBJQ ( '<a href="javascript:void(0);" class="fav-drag-handle">< i class="fa fa-bars"></i></a >' ) ;
529
529
530
530
// Hide the tool dropdown
531
531
$PBJQ ( '.toolMenus' , favoriteItem ) . remove ( ) ;
532
532
533
533
// Show a drag handle
534
534
favoriteItem . append ( dragHandle ) ;
535
535
536
- // And disable the link to site so we don't accidentally hit it while
537
- // dragging
538
- $PBJQ ( favoriteItem ) . find ( '.fav-title a' ) . attr ( 'href' , null ) ;
539
-
540
536
list . append ( favoriteItem ) ;
541
537
542
538
// Make sure the item is visible, just in case it was hidden on the other tab
543
539
favoriteItem . show ( ) ;
544
540
} ) ;
545
541
546
542
list . sortable ( {
543
+ handle : ".fav-drag-handle" ,
547
544
stop : function ( ) {
548
545
// Update our ordering based on the new selection
549
546
favoritesList = list . find ( '.organize-favorite-item' ) . map ( function ( ) {
Original file line number Diff line number Diff line change @@ -389,16 +389,13 @@ ul.favoriteSiteList{
389
389
.fav-drag-handle {
390
390
display : inline-block ;
391
391
position : relative ;
392
- right : -4px ;
392
+ right : 2px ;
393
+ padding : 0 6px ;
393
394
color : $tool-border-color ;
394
395
cursor : move ; /* fallback if grab cursor is unsupported */
395
396
cursor : grab ;
396
397
cursor : -moz-grab ;
397
398
cursor : -webkit-grab ;
398
-
399
- @media #{$phone } {
400
- display : none ;
401
- }
402
399
}
403
400
.fav-drag-handle :active {
404
401
cursor : grabbing ;
You can’t perform that action at this time.
0 commit comments