@@ -4,8 +4,17 @@ var link = (function(){
44
55var _returnToPreviousFocusLink = function ( ) {
66if ( _previousFocusLink != null ) {
7- helper . eA ( ".link-panel-back" ) [ _previousFocusLink ] . querySelectorAll ( ".link-control-item" ) [ 0 ] . focus ( ) ;
8- _previousFocusLink = null
7+ var linkPanelFront = helper . eA ( ".link-panel-front" ) ;
8+ if ( linkPanelFront . length > 0 ) {
9+ if ( _previousFocusLink >= 0 ) {
10+ linkPanelFront [ _previousFocusLink ] . focus ( ) ;
11+ } else {
12+ linkPanelFront [ 0 ] . focus ( ) ;
13+ } ;
14+ } else {
15+ helper . e ( "body" ) . focus ( ) ;
16+ } ;
17+ _previousFocusLink = null ;
918} ;
1019} ;
1120
@@ -129,11 +138,26 @@ var link = (function(){
129138} ;
130139
131140var remove = function ( bookmarkData ) {
132- bookmarks . remove ( bookmarkData ) ;
133- _checkCount ( ) ;
134- data . save ( ) ;
135- clear ( ) ;
136- render . item . all ( ) ;
141+ modal . render ( {
142+ heading : "Remove " + bookmarkData . name + " bookmark" ,
143+ content : "Are you sure you want to remove this bookmark? This can not be undone." ,
144+ successAction : function ( ) {
145+ _previousFocusLink = _previousFocusLink - 1 ;
146+ bookmarks . remove ( bookmarkData ) ;
147+ _checkCount ( ) ;
148+ data . save ( ) ;
149+ clear ( ) ;
150+ render . item . all ( ) ;
151+ control . dependents ( ) ;
152+ control . render ( ) ;
153+ _returnToPreviousFocusLink ( ) ;
154+ } ,
155+ cancelAction : function ( ) {
156+ _returnToPreviousFocusLink ( ) ;
157+ } ,
158+ actionText : "Remove" ,
159+ size : "small"
160+ } ) ;
137161} ;
138162
139163var _checkCount = function ( ) {
@@ -438,18 +462,8 @@ var link = (function(){
438462edit ( data ) ;
439463} , false ) ;
440464linkRemove . addEventListener ( "click" , function ( ) {
441- modal . render ( {
442- heading : "Remove " + data . name + " bookmark" ,
443- content : "Are you sure you want to remove this bookmark? This can not be undone." ,
444- successAction : function ( ) {
445- remove ( data ) ;
446- control . dependents ( ) ;
447- control . render ( ) ;
448- } ,
449- actionText : "Remove" ,
450- cancelText : "Cancel" ,
451- size : "small"
452- } ) ;
465+ _previousFocusLink = index ;
466+ remove ( data ) ;
453467} , false ) ;
454468
455469return linkItem ;
0 commit comments