Fossil SCM
Refactorings to cookie handling.
Commit
cf38f5abb8475e299b51ddccd867dfbdaa069d156b4afddcbcdb08625af1e263
Parent
ae932acdd239801…
1 file changed
+13
-4
+13
-4
| --- src/graph.js | ||
| +++ src/graph.js | ||
| @@ -939,10 +939,20 @@ | ||
| 939 | 939 | } |
| 940 | 940 | function focusCacheSet(v){ |
| 941 | 941 | var e = document.getElementById('timeline-kbfocus'); |
| 942 | 942 | if( e ) e.value = v; |
| 943 | 943 | } |
| 944 | + function focusCookieInit(){ | |
| 945 | + document.cookie = 'fossil_timeline_kbnav=1;path=/'; | |
| 946 | + } | |
| 947 | + function focusCookieClear(){ | |
| 948 | + document.cookie = | |
| 949 | + 'fossil_timeline_kbnav=;expires=Thu, 01 Jan 1970 00:00:01 GMT;path=/'; | |
| 950 | + } | |
| 951 | + function focusCookieQuery(){ | |
| 952 | + return document.cookie.match(/fossil_timeline_kbnav=1/); | |
| 953 | + } | |
| 944 | 954 | focusCacheInit(); |
| 945 | 955 | document.addEventListener('keydown',function(evt){ |
| 946 | 956 | if( evt.target.tagName=='INPUT' ) return; |
| 947 | 957 | var |
| 948 | 958 | mSHIFT = 1<<13, |
| @@ -1005,15 +1015,14 @@ | ||
| 1005 | 1015 | return; |
| 1006 | 1016 | } |
| 1007 | 1017 | else if( key==kDONE ){ |
| 1008 | 1018 | focusCacheSet(null); |
| 1009 | 1019 | focusVisualize(null,false); |
| 1010 | - document.cookie = | |
| 1011 | - 'fossil_timeline_kbnav=;expires=Thu, 01 Jan 1970 00:00:01 GMT;path=/'; | |
| 1020 | + focusCookieClear(); | |
| 1012 | 1021 | return; |
| 1013 | 1022 | } |
| 1014 | - document.cookie = 'fossil_timeline_kbnav=1;path=/'; | |
| 1023 | + focusCookieInit(); | |
| 1015 | 1024 | var id = focusCacheGet(); |
| 1016 | 1025 | if( id && dx==0 ){ |
| 1017 | 1026 | if( key==kCYCL ){ |
| 1018 | 1027 | var sel = focusSelectedId(); |
| 1019 | 1028 | var sl2 = focus2ndSelectedId(); |
| @@ -1069,14 +1078,14 @@ | ||
| 1069 | 1078 | focusVisualize(id,true); |
| 1070 | 1079 | }/*,true*/); |
| 1071 | 1080 | window.addEventListener('pageshow',function(evt){ |
| 1072 | 1081 | var id = focusCacheGet(); |
| 1073 | 1082 | if( !id || !focusVisualize(id,false) ){ |
| 1074 | - if( document.cookie.match(/fossil_timeline_kbnav=1/) ){ | |
| 1083 | + if( focusCookieQuery() ){ | |
| 1075 | 1084 | id = focusDefaultId(); |
| 1076 | 1085 | focusCacheSet(id); |
| 1077 | 1086 | focusVisualize(id,false); |
| 1078 | 1087 | } |
| 1079 | 1088 | } |
| 1080 | 1089 | },false); |
| 1081 | 1090 | },false); |
| 1082 | 1091 | }()); |
| 1083 | 1092 |
| --- src/graph.js | |
| +++ src/graph.js | |
| @@ -939,10 +939,20 @@ | |
| 939 | } |
| 940 | function focusCacheSet(v){ |
| 941 | var e = document.getElementById('timeline-kbfocus'); |
| 942 | if( e ) e.value = v; |
| 943 | } |
| 944 | focusCacheInit(); |
| 945 | document.addEventListener('keydown',function(evt){ |
| 946 | if( evt.target.tagName=='INPUT' ) return; |
| 947 | var |
| 948 | mSHIFT = 1<<13, |
| @@ -1005,15 +1015,14 @@ | |
| 1005 | return; |
| 1006 | } |
| 1007 | else if( key==kDONE ){ |
| 1008 | focusCacheSet(null); |
| 1009 | focusVisualize(null,false); |
| 1010 | document.cookie = |
| 1011 | 'fossil_timeline_kbnav=;expires=Thu, 01 Jan 1970 00:00:01 GMT;path=/'; |
| 1012 | return; |
| 1013 | } |
| 1014 | document.cookie = 'fossil_timeline_kbnav=1;path=/'; |
| 1015 | var id = focusCacheGet(); |
| 1016 | if( id && dx==0 ){ |
| 1017 | if( key==kCYCL ){ |
| 1018 | var sel = focusSelectedId(); |
| 1019 | var sl2 = focus2ndSelectedId(); |
| @@ -1069,14 +1078,14 @@ | |
| 1069 | focusVisualize(id,true); |
| 1070 | }/*,true*/); |
| 1071 | window.addEventListener('pageshow',function(evt){ |
| 1072 | var id = focusCacheGet(); |
| 1073 | if( !id || !focusVisualize(id,false) ){ |
| 1074 | if( document.cookie.match(/fossil_timeline_kbnav=1/) ){ |
| 1075 | id = focusDefaultId(); |
| 1076 | focusCacheSet(id); |
| 1077 | focusVisualize(id,false); |
| 1078 | } |
| 1079 | } |
| 1080 | },false); |
| 1081 | },false); |
| 1082 | }()); |
| 1083 |
| --- src/graph.js | |
| +++ src/graph.js | |
| @@ -939,10 +939,20 @@ | |
| 939 | } |
| 940 | function focusCacheSet(v){ |
| 941 | var e = document.getElementById('timeline-kbfocus'); |
| 942 | if( e ) e.value = v; |
| 943 | } |
| 944 | function focusCookieInit(){ |
| 945 | document.cookie = 'fossil_timeline_kbnav=1;path=/'; |
| 946 | } |
| 947 | function focusCookieClear(){ |
| 948 | document.cookie = |
| 949 | 'fossil_timeline_kbnav=;expires=Thu, 01 Jan 1970 00:00:01 GMT;path=/'; |
| 950 | } |
| 951 | function focusCookieQuery(){ |
| 952 | return document.cookie.match(/fossil_timeline_kbnav=1/); |
| 953 | } |
| 954 | focusCacheInit(); |
| 955 | document.addEventListener('keydown',function(evt){ |
| 956 | if( evt.target.tagName=='INPUT' ) return; |
| 957 | var |
| 958 | mSHIFT = 1<<13, |
| @@ -1005,15 +1015,14 @@ | |
| 1015 | return; |
| 1016 | } |
| 1017 | else if( key==kDONE ){ |
| 1018 | focusCacheSet(null); |
| 1019 | focusVisualize(null,false); |
| 1020 | focusCookieClear(); |
| 1021 | return; |
| 1022 | } |
| 1023 | focusCookieInit(); |
| 1024 | var id = focusCacheGet(); |
| 1025 | if( id && dx==0 ){ |
| 1026 | if( key==kCYCL ){ |
| 1027 | var sel = focusSelectedId(); |
| 1028 | var sl2 = focus2ndSelectedId(); |
| @@ -1069,14 +1078,14 @@ | |
| 1078 | focusVisualize(id,true); |
| 1079 | }/*,true*/); |
| 1080 | window.addEventListener('pageshow',function(evt){ |
| 1081 | var id = focusCacheGet(); |
| 1082 | if( !id || !focusVisualize(id,false) ){ |
| 1083 | if( focusCookieQuery() ){ |
| 1084 | id = focusDefaultId(); |
| 1085 | focusCacheSet(id); |
| 1086 | focusVisualize(id,false); |
| 1087 | } |
| 1088 | } |
| 1089 | },false); |
| 1090 | },false); |
| 1091 | }()); |
| 1092 |