MediaWiki:Gadget-GrAnnotations.js: Difference between revisions
No edit summary |
No edit summary |
||
| (43 intermediate revisions by 2 users not shown) | |||
| Line 1: | Line 1: | ||
/** | /** | ||
* gr_annotations.js — grantha.io inline Notes + Bookmarks + Feedback ( | * gr_annotations.js — grantha.io inline Notes + Bookmarks + Feedback (v6 + Strategy B) | ||
*/ | */ | ||
| Line 24: | Line 7: | ||
'use strict'; | 'use strict'; | ||
var CONTENT_SEL = '#mw-content-text'; | var CONTENT_SEL = '#mw-content-text'; | ||
var BM_LS_KEY = 'grantha_bm_' + ( ( window.mw && mw.config.get( 'wgPageName' ) ) || '' ); | var BM_LS_KEY = 'grantha_bm_' + ( ( window.mw && mw.config.get( 'wgPageName' ) ) || '' ); | ||
| Line 32: | Line 13: | ||
var currentUser = ( window.mw && mw.config.get( 'wgUserName' ) ) || ''; | var currentUser = ( window.mw && mw.config.get( 'wgUserName' ) ) || ''; | ||
var userInitial = currentUser ? currentUser.charAt( 0 ).toUpperCase() : '?'; | var userInitial = currentUser ? currentUser.charAt( 0 ).toUpperCase() : '?'; | ||
var currentUserEmail = ''; | |||
if ( currentUser && window.mw ) { | |||
new mw.Api().get({ action: 'query', meta: 'userinfo', uiprop: 'email', formatversion: 2 }) | |||
.then( function (data) { | |||
var info = data && data.query && data.query.userinfo; | |||
if ( info && info.email ) currentUserEmail = info.email; | |||
} ).catch( function () {} ); | |||
} | |||
if ( window.mw ) { | if ( window.mw ) { | ||
| Line 38: | Line 28: | ||
} | } | ||
var _selRange = null; | var _selRange = null; | ||
var _selText = ''; | var _selText = ''; | ||
var _selRect = null; | var _selRect = null; | ||
var _notes = []; | var _notes = []; | ||
var _bookmarks = []; | var _bookmarks = []; | ||
var _activeTab = 'notes'; | var _activeTab = 'notes'; | ||
var _selVersion = 0; | var _selVersion = 0; | ||
var _fabSelVer = -1; | var _fabSelVer = -1; | ||
var _mobile = window.innerWidth < 768 || 'ontouchstart' in window; | |||
var _fabTouched = false; // flag to prevent hideActions when tapping fab | |||
function uid() { return 'gra_' + Date.now() + '_' + Math.random().toString(36).slice(2,7); } | |||
function uid() { | function esc(s) { | ||
return String(s||'').replace(/&/g,'&').replace(/</g,'<') | |||
.replace(/>/g,'>').replace(/"/g,'"'); | |||
function esc( s ) { | |||
return String( s || '' ) | |||
} | } | ||
function nowIso() { return new Date().toISOString().replace(/\.\d{3}Z$/,'Z'); } | function nowIso() { return new Date().toISOString().replace(/\.\d{3}Z$/,'Z'); } | ||
function fmtTs( ts ) { | function fmtTs(ts) { | ||
try { | try { | ||
var d = new Date( ts ); | var d = new Date(ts); | ||
return d.toLocaleDateString('en-IN',{day:'numeric',month:'short',year:'numeric'}) | return d.toLocaleDateString('en-IN',{day:'numeric',month:'short',year:'numeric'}) | ||
+ ' ' + d.toLocaleTimeString('en-IN',{hour:'2-digit',minute:'2-digit',hour12:false}); | + ' ' + d.toLocaleTimeString('en-IN',{hour:'2-digit',minute:'2-digit',hour12:false}); | ||
} catch(e){ return ts; } | } catch(e){ return ts; } | ||
} | } | ||
function clamp( v, lo, hi ) { return Math.max(lo, Math.min(hi, v)); } | function clamp(v,lo,hi){ return Math.max(lo,Math.min(hi,v)); } | ||
function isMobile() { return | function isMobile() { return _mobile; } | ||
var $fab, $mobileBar, $panel, $backdrop; | |||
var $fab, $panel, $backdrop; | |||
var $ntComposer, $ntInput, $ntSubmit; | var $ntComposer, $ntInput, $ntSubmit; | ||
var $bmComposer, $bmInput, $bmSubmit; | var $bmComposer, $bmInput, $bmSubmit; | ||
var $fbComposer, $fbIssueType, $fbText, $fbEmail, $fbSubmit, $fbQuote; | var $fbComposer, $fbIssueType, $fbText, $fbEmail, $fbSubmit, $fbQuote; | ||
var $tabNotes, $tabBookmarks | var $tabNotes, $tabBookmarks, $paneNotes, $paneBookmarks; | ||
function buildDom() { | function buildDom() { | ||
$fab = $( [ | $fab = $( [ | ||
'<div id="gra-fab" role="toolbar" aria-label="Feedback / | '<div id="gra-fab" role="toolbar" aria-label="Feedback / Notes / Bookmark">', | ||
// | ' <button class="gra-fab-btn" id="gra-fab-note" type="button" aria-label="Note">', | ||
' <button class="gra-fab-btn" id="gra-fab-feedback" type="button" aria-label=" | ' <span class="gra-icon gra-icon-note" aria-hidden="true"></span>', | ||
' <span class="gra-fab-btn-label">Note</span>', | |||
' </button>', | |||
' <button class="gra-fab-btn" id="gra-fab-bookmark" type="button" aria-label="Mark">', | |||
' <span class="gra-icon gra-icon-bookmark" aria-hidden="true"></span>', | |||
' <span class="gra-fab-btn-label">Mark</span>', | |||
' </button>', | |||
' <button class="gra-fab-btn" id="gra-fab-feedback" type="button" aria-label="Feedback">', | |||
' <span class="gra-icon gra-icon-feedback" aria-hidden="true"></span>', | ' <span class="gra-icon gra-icon-feedback" aria-hidden="true"></span>', | ||
' <span class="gra-fab- | ' <span class="gra-fab-btn-label">Feedback</span>', | ||
' </button>', | ' </button>', | ||
' <button class="gra-fab-btn" id="gra-fab-search" type="button" aria-label="Search">', | |||
' <button class="gra-fab-btn" id="gra-fab- | ' <span class="gra-icon gra-icon-search" aria-hidden="true"></span>', | ||
' <span class="gra-icon gra-icon- | ' <span class="gra-fab-btn-label">Search</span>', | ||
' <span class="gra-fab- | |||
' </button>', | ' </button>', | ||
' <button class="gra-fab-btn gra-fab-btn-dismiss" id="gra-fab-dismiss" type="button" aria-label="Dismiss">', | |||
' <button class="gra-fab-btn" id="gra-fab- | ' <span class="gra-icon gra-icon-dismiss" aria-hidden="true"></span>', | ||
' <span class="gra-icon gra-icon- | ' <span class="gra-fab-btn-label">Close</span>', | ||
' <span class="gra-fab- | |||
' </button>', | ' </button>', | ||
'</div>', | '</div>', | ||
].join('') ); | ].join('') ); | ||
$( 'body' ).append( $fab ); | $('body').append($fab); | ||
$mobileBar = $('<div id="gra-mobile-bar"></div>'); | |||
$('body').append($mobileBar); | |||
$fbComposer = $( [ | $fbComposer = $( [ | ||
'<div class="gra-composer" id="gra-fb-composer" role="dialog" aria-label="Send feedback">', | '<div class="gra-composer" id="gra-fb-composer" role="dialog" aria-label="Send feedback">', | ||
| Line 117: | Line 103: | ||
' <select class="gra-fb-select" id="gra-fb-issue">', | ' <select class="gra-fb-select" id="gra-fb-issue">', | ||
' <option value="">— Choose —</option>', | ' <option value="">— Choose —</option>', | ||
' <option value="wrong_text"> | ' <option value="wrong_text">Formatting error</option>', | ||
' <option value="reference_issue">Reference issue</option>', | ' <option value="reference_issue">Reference issue</option>', | ||
' <option value="spelling_mistake">Spelling mistake</option>', | ' <option value="spelling_mistake">Spelling mistake</option>', | ||
| Line 123: | Line 109: | ||
' </select>', | ' </select>', | ||
' <div class="gra-fb-field-label">Details (optional)</div>', | ' <div class="gra-fb-field-label">Details (optional)</div>', | ||
' <textarea class="gra-composer-input" id="gra-fb-text" | ' <textarea class="gra-composer-input" id="gra-fb-text" placeholder="Describe the issue…" rows="3"></textarea>', | ||
' <div class="gra-fb-field-label">Your email (optional)</div>', | ' <div class="gra-fb-field-label">Your email (optional)</div>', | ||
' <input class="gra-composer-input gra-fb-email-input" id="gra-fb-email" | ' <input class="gra-composer-input gra-fb-email-input" id="gra-fb-email" type="email" placeholder="you@example.com" autocomplete="email">', | ||
' <div class="gra-composer-actions">', | ' <div class="gra-composer-actions">', | ||
' <button class="gra-btn-cancel" id="gra-fb-cancel">Cancel</button>', | ' <button class="gra-btn-cancel" id="gra-fb-cancel">Cancel</button>', | ||
| Line 135: | Line 119: | ||
'</div>', | '</div>', | ||
].join('') ); | ].join('') ); | ||
$( 'body' ).append( $fbComposer ); | $('body').append($fbComposer); | ||
$ntComposer = $( [ | $ntComposer = $( [ | ||
'<div class="gra-composer" id="gra-nt-composer" role="dialog" aria-label="Add note">', | '<div class="gra-composer" id="gra-nt-composer" role="dialog" aria-label="Add note">', | ||
' <div class="gra-composer-user">', | ' <div class="gra-composer-user">', | ||
' <div class="gra | ' <div class="gra-avatar">' + esc(currentUser ? userInitial : '✎') + '</div>', | ||
' <div class="gra-composer-uname">' + esc(currentUser || ' | ' <div class="gra-composer-uname">' + esc(currentUser || 'Notes') + '</div>', | ||
' </div>', | ' </div>', | ||
' <textarea class="gra-composer-input" id="gra-nt-input" | ' <textarea class="gra-composer-input" id="gra-nt-input" placeholder="Write a note…" rows="3"></textarea>', | ||
' <div class="gra-composer-actions">', | ' <div class="gra-composer-actions">', | ||
' <button class="gra-btn-cancel" id="gra-nt-cancel">Cancel</button>', | ' <button class="gra-btn-cancel" id="gra-nt-cancel">Cancel</button>', | ||
| Line 152: | Line 134: | ||
'</div>', | '</div>', | ||
].join('') ); | ].join('') ); | ||
$( 'body' ).append( $ntComposer ); | $('body').append($ntComposer); | ||
$bmComposer = $( [ | $bmComposer = $( [ | ||
'<div class="gra-bm-composer" id="gra-bm-composer" role="dialog" aria-label="Bookmark">', | '<div class="gra-bm-composer" id="gra-bm-composer" role="dialog" aria-label="Bookmark">', | ||
| Line 161: | Line 142: | ||
' Save bookmark', | ' Save bookmark', | ||
' </div>', | ' </div>', | ||
' <input class="gra-composer-input" id="gra-bm-input" | ' <input class="gra-composer-input" id="gra-bm-input" type="text" placeholder="Name this bookmark…" autocomplete="off">', | ||
' <div class="gra-composer-actions">', | ' <div class="gra-composer-actions">', | ||
' <button class="gra-btn-cancel" id="gra-bm-cancel">Cancel</button>', | ' <button class="gra-btn-cancel" id="gra-bm-cancel">Cancel</button>', | ||
| Line 169: | Line 149: | ||
'</div>', | '</div>', | ||
].join('') ); | ].join('') ); | ||
$( 'body' ).append( $bmComposer ); | $('body').append($bmComposer); | ||
$panel = $( [ | $panel = $( [ | ||
'<div id="gra-panel" role="complementary" aria-label="Notes">', | '<div id="gra-panel" role="complementary" aria-label="Notes">', | ||
| Line 188: | Line 167: | ||
' <div id="gra-panel-body">', | ' <div id="gra-panel-body">', | ||
' <div class="gra-pane gra-pane-active" id="gra-pane-notes"></div>', | ' <div class="gra-pane gra-pane-active" id="gra-pane-notes"></div>', | ||
' <div class="gra-pane" | ' <div class="gra-pane" id="gra-pane-bookmarks"></div>', | ||
' </div>', | ' </div>', | ||
'</div>', | '</div>', | ||
].join('') ); | ].join('') ); | ||
$( 'body' ).append( $panel ); | $('body').append($panel); | ||
$backdrop = $( '<div id="gra-backdrop" aria-hidden="true"></div>' ); | $backdrop = $('<div id="gra-backdrop" aria-hidden="true"></div>'); | ||
$( 'body' ).append( $backdrop ); | $('body').append($backdrop); | ||
var $toggle = $( [ | var $toggle = $( [ | ||
'<button id="gra-toggle" aria-label="Notes">', | '<button id="gra-toggle" aria-label="Notes">', | ||
| Line 204: | Line 182: | ||
'</button>', | '</button>', | ||
].join('') ); | ].join('') ); | ||
$( 'body' ).append( $toggle ); | $('body').append($toggle); | ||
$toggle.on( 'click', function() { | $toggle.on('click', function() { | ||
$panel.hasClass('gra-panel-open') ? closePanel() : openPanel( _activeTab ); | $panel.hasClass('gra-panel-open') ? closePanel() : openPanel(_activeTab); | ||
} ); | }); | ||
$('#gra-panel-title').text(pageTitle.replace(/_/g,' ').split('/')[0].slice(0,30)); | |||
$( '#gra-panel-title' ) | $tabNotes = $('#gra-tab-notes'); | ||
$tabBookmarks = $('#gra-tab-bookmarks'); | |||
$tabNotes = $( '#gra-tab-notes' ); | $paneNotes = $('#gra-pane-notes'); | ||
$tabBookmarks = $( '#gra-tab-bookmarks' ); | $paneBookmarks= $('#gra-pane-bookmarks'); | ||
$paneNotes = $( '#gra-pane-notes' ); | $ntInput = $('#gra-nt-input'); | ||
$paneBookmarks= $( '#gra-pane-bookmarks' ); | $ntSubmit = $('#gra-nt-submit'); | ||
$ntInput = $( '#gra-nt-input' ); | $bmInput = $('#gra-bm-input'); | ||
$ntSubmit = $( '#gra-nt-submit' ); | $bmSubmit = $('#gra-bm-submit'); | ||
$bmInput = $( '#gra-bm-input' ); | $fbIssueType = $('#gra-fb-issue'); | ||
$bmSubmit = $( '#gra-bm-submit' ); | $fbText = $('#gra-fb-text'); | ||
$fbIssueType = $( '#gra-fb-issue' ); | $fbEmail = $('#gra-fb-email'); | ||
$fbText = $( '#gra-fb-text' ); | $fbSubmit = $('#gra-fb-submit'); | ||
$fbEmail = $( '#gra-fb-email' ); | $fbQuote = $('#gra-fb-quote'); | ||
$fbSubmit = $( '#gra-fb-submit' ); | |||
$fbQuote = $( '#gra-fb-quote' ); | |||
} | } | ||
function captureSelection() { | function captureSelection() { | ||
var sel = window.getSelection(); | var sel = window.getSelection(); | ||
if ( !sel || sel.isCollapsed || !sel.rangeCount ) return false; | if (!sel || sel.isCollapsed || !sel.rangeCount) return false; | ||
var range = sel.getRangeAt(0); | var range = sel.getRangeAt(0); | ||
var text = sel.toString().trim(); | var text = sel.toString().trim(); | ||
if ( !text || text.length < 2 ) return false; | if (!text || text.length < 2) return false; | ||
var contentEl = document.querySelector( CONTENT_SEL ); | var contentEl = document.querySelector(CONTENT_SEL); | ||
if ( !contentEl ) return false; | if (!contentEl) return false; | ||
var | var ancestor = range.commonAncestorContainer; | ||
if ( | if (ancestor.nodeType === 3) ancestor = ancestor.parentNode; | ||
if ( !contentEl.contains( | if (!ancestor || !contentEl.contains(ancestor)) return false; | ||
var _editorEl = document.getElementById('se-surface') || | |||
document.querySelector('.se-outer'); | |||
if ( _editorEl && _editorEl.contains(ancestor) ) return false; | |||
_selText = text; | _selText = text; | ||
_selRect = range.getBoundingClientRect(); | _selRect = range.getBoundingClientRect(); | ||
try { _selRange = range.cloneRange(); } | |||
catch(e){ _selRange = null; } | |||
return true; | return true; | ||
} | } | ||
function | function reCaptureFromDOM() { | ||
if ( | if (!_selText) return false; | ||
if ( | var contentEl = document.querySelector(CONTENT_SEL); | ||
if (!contentEl) return false; | |||
if ( | var found = findTextInContent(contentEl, _selText.slice(0,80).replace(/…$/,'').trim()); | ||
if (!found) return false; | |||
_selRange = found; | |||
return true; | |||
} | } | ||
function tryShowActions() { | |||
if ($fbComposer && $fbComposer.hasClass('gra-composer-visible')) return; | |||
if ($ntComposer && $ntComposer.hasClass('gra-composer-visible')) return; | |||
if ($bmComposer && $bmComposer.hasClass('gra-composer-visible')) return; | |||
if (!captureSelection()) { hideActions(); return; } | |||
_fabSelVer = _selVersion; | |||
showFab(_selRect); | |||
} | |||
function showFab( rect ) { | function showFab(rect) { | ||
if ( !rect ) return; | if (!rect) return; | ||
var fabW = 46 | var fabW, fabH, top, left; | ||
if (_mobile) { | |||
/* Docked as a fixed bar below the reader toolbar. | |||
if ( left + fabW > window.innerWidth - 8 ) left = rect.left - fabW - 10; | All positioning is handled by CSS via .gra-fab-mobile-docked, | ||
top = clamp( top, 8, window.innerHeight - fabH - 8 ); | so it never collides with the native selection menu and never | ||
left = clamp( left, 8, window.innerWidth - fabW - 8 ); | clips at screen edges or causes horizontal scroll. */ | ||
$fab.css({ position: '', top: '', left: '', visibility: '' }) | |||
.addClass('gra-fab-visible gra-fab-mobile-docked'); | |||
return; | |||
} | |||
fabW = 46; fabH = 126; | |||
top = rect.top + (rect.height / 2) - (fabH / 2); | |||
left = rect.right + 10; | |||
if (left + fabW > window.innerWidth - 8) left = rect.left - fabW - 10; | |||
top = clamp(top, 8, window.innerHeight - fabH - 8); | |||
left = clamp(left, 8, window.innerWidth - fabW - 8); | |||
$fab.css({ top: top + 'px', left: left + 'px' }).addClass('gra-fab-visible'); | $fab.css({ top: top + 'px', left: left + 'px' }).addClass('gra-fab-visible'); | ||
} | } | ||
function hideFab() { $fab.removeClass('gra-fab-visible'); } | function hideFab() { $fab.removeClass('gra-fab-visible gra-fab-mobile-docked'); } | ||
function hideActions() { hideFab(); } | |||
function | |||
function wrapSelection( id, cssClass ) { | function wrapSelection(id, cssClass) { | ||
var range = _selRange; | var range = _selRange; | ||
_selRange = null; | _selRange = null; | ||
if (!range) return null; | |||
try { | try { | ||
if (!document.contains(range.startContainer) || | |||
!document.contains(range.endContainer)) return null; | |||
} catch(e) { return null; } | |||
function makeSpan() { | |||
var sp = document.createElement('span'); | |||
} catch (e) { | sp.className = cssClass; | ||
sp.setAttribute('data-gra-id', id); | |||
return sp; | |||
} | } | ||
try { | |||
var span = makeSpan(); | |||
range.surroundContents(span); | |||
if (span.parentNode) return span; | |||
} catch(e) {} | |||
try { | |||
var frag = range.extractContents(); | |||
var sp2 = makeSpan(); | |||
sp2.appendChild(frag); | |||
range.insertNode(sp2); | |||
if (sp2 && sp2.parentNode) return sp2; | |||
} catch(e2) {} | |||
return null; | |||
} | } | ||
function openFeedbackComposer() { | function openFeedbackComposer() { | ||
hideActions(); | |||
$fbQuote.text(_selText.slice(0,200) + (_selText.length > 200 ? '…' : '')); | |||
$fbQuote.text( _selText.slice(0, 200) + (_selText.length > 200 ? '…' : '') ); | |||
$fbIssueType.val(''); | $fbIssueType.val(''); | ||
$fbText.val(''); | $fbText.val(''); | ||
$fbSubmit.prop('disabled', true); | $fbSubmit.prop('disabled', true); | ||
$( '#gra-fb-status' ).text('').removeClass('gra-fb-ok gra-fb-err'); | $('#gra-fb-status').text('').removeClass('gra-fb-ok gra-fb-err'); | ||
if (currentUserEmail) $fbEmail.val(currentUserEmail); | |||
else $fbEmail.val(''); | |||
if (!_mobile) $fbComposer.css({top:'', left:'', transform:''}); | |||
$fbComposer.addClass('gra-composer-visible'); | $fbComposer.addClass('gra-composer-visible'); | ||
setTimeout( function() { $fbIssueType.focus(); }, isMobile() ? 300 : 0 ); | $backdrop.addClass('gra-backdrop-visible'); | ||
setTimeout(function(){ $fbIssueType.focus(); }, isMobile() ? 300 : 0); | |||
} | } | ||
function closeFeedbackComposer() { | function closeFeedbackComposer() { | ||
$fbComposer.removeClass('gra-composer-visible'); | $fbComposer.removeClass('gra-composer-visible'); | ||
$backdrop.removeClass('gra-backdrop-visible'); | |||
_selRange = null; _selText = ''; _selRect = null; | _selRange = null; _selText = ''; _selRect = null; | ||
} | } | ||
| Line 349: | Line 322: | ||
var email = $fbEmail.val().trim(); | var email = $fbEmail.val().trim(); | ||
var quote = $fbQuote.text(); | var quote = $fbQuote.text(); | ||
if (!issueType) return; | |||
if ( !issueType ) return; | |||
$fbSubmit.prop('disabled', true).text('Sending…'); | $fbSubmit.prop('disabled', true).text('Sending…'); | ||
$( '#gra-fb-status' ).text('').removeClass('gra-fb-ok gra-fb-err'); | $('#gra-fb-status').text('').removeClass('gra-fb-ok gra-fb-err'); | ||
var issueLabels = { | var issueLabels = { | ||
wrong_text: | wrong_text: 'Formatting error', reference_issue: 'Reference issue', | ||
spelling_mistake: 'Spelling mistake', other: 'Other' | |||
spelling_mistake: 'Spelling mistake', | |||
}; | }; | ||
var payload = new FormData(); | |||
var | payload.append('issue_type', issueLabels[issueType] || issueType); | ||
payload.append('page', pageTitle.replace(/_/g,' ')); | |||
payload.append('url', window.location.href); | |||
payload.append('selected_text', quote); | |||
payload.append('details', details || ''); | |||
payload.append('user_email', email || currentUserEmail || ''); | |||
payload.append('wiki_user', currentUser || 'anonymous'); | |||
fetch('/feedback.php', {method:'POST', body:payload}) | |||
.then(function(r){ return r.json(); }) | |||
.then(function(data){ | |||
if (data && data.ok) showFeedbackSuccess(); | |||
else showFeedbackError(data && data.error ? data.error : 'Could not send.'); | |||
}) | |||
.catch(function(){ showFeedbackError('Network error. Please try again.'); }); | |||
}) | |||
} | } | ||
function showFeedbackSuccess() { | function showFeedbackSuccess() { | ||
$fbSubmit.text('Send'); | $fbSubmit.prop('disabled', false).text('Send'); | ||
$( '#gra-fb-status' ) | $('#gra-fb-status').text('✓ Feedback sent. Thank you!').addClass('gra-fb-ok'); | ||
setTimeout(closeFeedbackComposer, 2500); | |||
} | |||
setTimeout( closeFeedbackComposer, | function showFeedbackError(msg) { | ||
$fbSubmit.prop('disabled', false).text('Send'); | |||
$('#gra-fb-status').text('✗ ' + msg).addClass('gra-fb-err'); | |||
} | } | ||
function openNoteComposer() { | function openNoteComposer() { | ||
hideActions(); | |||
if (!_mobile) $ntComposer.css({ top: '', left: '', transform: '' }); | |||
$ntComposer.addClass('gra-composer-visible'); | $ntComposer.addClass('gra-composer-visible'); | ||
setTimeout( function() { $ntInput.focus(); }, isMobile() ? 300 : 0 ); | $backdrop.addClass('gra-backdrop-visible'); | ||
setTimeout(function(){ $ntInput.focus(); }, isMobile() ? 300 : 0); | |||
} | } | ||
function closeNoteComposer() { | function closeNoteComposer() { | ||
$ntComposer.removeClass('gra-composer-visible'); | $ntComposer.removeClass('gra-composer-visible'); | ||
$backdrop.removeClass('gra-backdrop-visible'); | |||
$ntInput.val(''); | $ntInput.val(''); | ||
$ntSubmit.prop('disabled', true); | $ntSubmit.prop('disabled', true); | ||
| Line 437: | Line 374: | ||
function submitNote() { | function submitNote() { | ||
var text = $ntInput.val().trim(); | var text = $ntInput.val().trim(); | ||
if ( !text ) return; | if (!text) return; | ||
var id = uid(); | var id = uid(); | ||
var ts = nowIso(); | var ts = nowIso(); | ||
var quote = _selText.slice(0,120) + (_selText.length > 120 ? '…' : ''); | var quote = _selText.slice(0,120) + (_selText.length > 120 ? '…' : ''); | ||
var span = wrapSelection( id, 'gra-note-highlight' ); | if (!_selRange && _selText) reCaptureFromDOM(); | ||
if ( span ) span.setAttribute('data-gra-quote', quote); | var span = wrapSelection(id, 'gra-note-highlight'); | ||
if (span) span.setAttribute('data-gra-quote', quote); | |||
_notes.push({id:id, ts:ts, quote:quote, text:text}); | |||
persistNotes(); | persistNotes(); | ||
persistNoteHighlight( id, quote ); | persistNoteHighlight(id, quote); | ||
renderNoteCards(); | renderNoteCards(); | ||
closeNoteComposer(); | closeNoteComposer(); | ||
| Line 453: | Line 390: | ||
function persistNotes() { | function persistNotes() { | ||
try { localStorage.setItem( NT_LS_KEY, JSON.stringify(_notes) ); } catch(e){} | try { localStorage.setItem(NT_LS_KEY, JSON.stringify(_notes)); } catch(e){} | ||
} | } | ||
function loadNotes() { | function loadNotes() { | ||
try { | try { var r = localStorage.getItem(NT_LS_KEY); if (r) _notes = JSON.parse(r)||[]; } catch(e){} | ||
} | } | ||
function openBookmarkComposer() { | function openBookmarkComposer() { | ||
hideActions(); | |||
if (!_mobile) $bmComposer.css({ top: '', left: '', transform: '' }); | |||
$bmComposer.addClass('gra-composer-visible'); | $bmComposer.addClass('gra-composer-visible'); | ||
setTimeout( function() { $bmInput.focus(); }, isMobile() ? 300 : 0 ); | $backdrop.addClass('gra-backdrop-visible'); | ||
setTimeout(function(){ $bmInput.focus(); }, isMobile() ? 300 : 0); | |||
} | } | ||
function closeBookmarkComposer() { | function closeBookmarkComposer() { | ||
$bmComposer.removeClass('gra-composer-visible'); | $bmComposer.removeClass('gra-composer-visible'); | ||
$backdrop.removeClass('gra-backdrop-visible'); | |||
$bmInput.val(''); | $bmInput.val(''); | ||
_selRange = null; _selText = ''; _selRect = null; | _selRange = null; _selText = ''; _selRect = null; | ||
| Line 481: | Line 412: | ||
function submitBookmark() { | function submitBookmark() { | ||
var name = $bmInput.val().trim() || ('Bookmark ' + (_bookmarks.length + 1)); | var name = $bmInput.val().trim() || ('Bookmark ' + (_bookmarks.length+1)); | ||
var id = uid(); | var id = uid(); | ||
var quote = _selText.slice(0,120) + (_selText.length > 120 ? '…' : ''); | var quote = _selText.slice(0,120) + (_selText.length > 120 ? '…' : ''); | ||
if (!_selRange && _selText) reCaptureFromDOM(); | |||
var span = wrapSelection(id, 'gra-bookmark-highlight'); | var span = wrapSelection(id, 'gra-bookmark-highlight'); | ||
if (span) { span.setAttribute('data-gra-id', id); span.setAttribute('data-gra-name', name); } | if (span) { span.setAttribute('data-gra-id', id); span.setAttribute('data-gra-name', name); } | ||
_bookmarks.push({ id:id, name:name, quote:quote, ts:nowIso() }); | _bookmarks.push({id:id, name:name, quote:quote, ts:nowIso()}); | ||
persistBookmarks(); | persistBookmarks(); | ||
renderBookmarkCards(); | renderBookmarkCards(); | ||
| Line 493: | Line 425: | ||
} | } | ||
function deleteBookmark( id ) { | function deleteBookmark(id) { | ||
_bookmarks = _bookmarks.filter(function(b){ return b.id !== id; }); | _bookmarks = _bookmarks.filter(function(b){ return b.id !== id; }); | ||
var span = document.querySelector('[data-gra-id="'+id+'"].gra-bookmark-highlight'); | var span = document.querySelector('[data-gra-id="'+id+'"].gra-bookmark-highlight'); | ||
if (span) { | if (span && span.parentNode) { | ||
var | var p = span.parentNode; | ||
while (span.firstChild) | while (span.firstChild) p.insertBefore(span.firstChild, span); | ||
p.removeChild(span); | |||
} | } | ||
persistBookmarks(); renderBookmarkCards(); | persistBookmarks(); renderBookmarkCards(); | ||
| Line 510: | Line 442: | ||
try { var r = localStorage.getItem(BM_LS_KEY); if (r) _bookmarks = JSON.parse(r)||[]; } catch(e){} | try { var r = localStorage.getItem(BM_LS_KEY); if (r) _bookmarks = JSON.parse(r)||[]; } catch(e){} | ||
} | } | ||
function openPanel(tab) { | function openPanel(tab) { | ||
| Line 534: | Line 462: | ||
else renderBookmarkCards(); | else renderBookmarkCards(); | ||
} | } | ||
function renderNoteCards() { | function renderNoteCards() { | ||
if (!_notes.length) { | if (!_notes.length) { | ||
$paneNotes.html('<div class="gra-empty-state">No notes yet.<br>Select text and | $paneNotes.html('<div class="gra-empty-state">No notes yet.<br>Select text and tap ✎ to add one.</div>'); | ||
return; | return; | ||
} | } | ||
var html = ''; | var html = ''; | ||
_notes.slice().reverse().forEach(function(n){ | _notes.slice().reverse().forEach(function(n){ | ||
html += '<div class="gra-note-card" data-gra-id="' + esc(n.id) + '">' | html += '<div class="gra-note-card" data-gra-id="'+esc(n.id)+'">' | ||
+ '<div class="gra-card-header">' | + '<div class="gra-card-header">' | ||
+ '< | + '<span class="gra-icon gra-icon-note" aria-hidden="true"></span>' | ||
+ '<div class="gra-card-meta">' | + '<div class="gra-card-meta">' | ||
+ (n.ts ? '<div class="gra-card-ts">' + esc(fmtTs(n.ts)) + '</div>' : '') | + (n.ts ? '<div class="gra-card-ts">'+esc(fmtTs(n.ts))+'</div>' : '') | ||
+ '</div>' | + '</div>' | ||
+ '<button class="gra-note-del" data-del-id="' + esc(n.id) + '" title="Delete">×</button>' | + '<button class="gra-note-del" data-del-id="'+esc(n.id)+'" title="Delete">×</button>' | ||
+ '</div>' | + '</div>' | ||
+ (n.quote ? '<div class="gra-card-quote">' + esc(n.quote) + '</div>' : '') | + (n.quote ? '<div class="gra-card-quote">'+esc(n.quote)+'</div>' : '') | ||
+ '<div class="gra-card-text">' + esc(n.text) + '</div>' | + '<div class="gra-card-text">'+esc(n.text)+'</div>' | ||
+ '</div>'; | + '</div>'; | ||
}); | }); | ||
| Line 561: | Line 485: | ||
} | } | ||
function deleteNote( id ) { | function deleteNote(id) { | ||
_notes = _notes.filter(function(n){ return n.id !== id; }); | _notes = _notes.filter(function(n){ return n.id !== id; }); | ||
var span = document.querySelector('[data-gra-id="'+id+'"].gra-note-highlight'); | var span = document.querySelector('[data-gra-id="'+id+'"].gra-note-highlight'); | ||
if (span) { | if (span && span.parentNode) { | ||
var | var p = span.parentNode; | ||
while (span.firstChild) | while (span.firstChild) p.insertBefore(span.firstChild, span); | ||
p.removeChild(span); | |||
} | } | ||
try { | try { | ||
var s = JSON.parse(localStorage.getItem(NT_LS_KEY+'_hl')||'[]'); | var s = JSON.parse(localStorage.getItem(NT_LS_KEY+'_hl')||'[]'); | ||
| Line 575: | Line 498: | ||
localStorage.setItem(NT_LS_KEY+'_hl', JSON.stringify(s)); | localStorage.setItem(NT_LS_KEY+'_hl', JSON.stringify(s)); | ||
} catch(e){} | } catch(e){} | ||
persistNotes(); | persistNotes(); renderNoteCards(); | ||
} | } | ||
function renderBookmarkCards() { | function renderBookmarkCards() { | ||
if (!_bookmarks.length) { | if (!_bookmarks.length) { | ||
$paneBookmarks.html('<div class="gra-empty-state">No bookmarks yet.<br>Select text and | $paneBookmarks.html('<div class="gra-empty-state">No bookmarks yet.<br>Select text and tap 🔖 to save one.</div>'); | ||
return; | return; | ||
} | } | ||
var html = ''; | var html = ''; | ||
_bookmarks.slice().reverse().forEach(function(b){ | _bookmarks.slice().reverse().forEach(function(b){ | ||
html += '<div class="gra-bookmark-card" data-gra-id="' + esc(b.id) + '">' | html += '<div class="gra-bookmark-card" data-gra-id="'+esc(b.id)+'">' | ||
+ '<span class="gra-icon gra-icon-bookmark" aria-hidden="true"></span>' | + '<span class="gra-icon gra-icon-bookmark" aria-hidden="true"></span>' | ||
+ '<div class="gra-bookmark-info">' | + '<div class="gra-bookmark-info">' | ||
+ '<div class="gra-bookmark-name">' + esc(b.name) + '</div>' | + '<div class="gra-bookmark-name">'+esc(b.name)+'</div>' | ||
+ (b.quote ? '<div class="gra-bookmark-quote">' + esc(b.quote) + '</div>' : '') | + (b.quote ? '<div class="gra-bookmark-quote">'+esc(b.quote)+'</div>' : '') | ||
+ '</div>' | + '</div>' | ||
+ '<button class="gra-bookmark-del" data-del-id="' + esc(b.id) + '" title="Remove">×</button>' | + '<button class="gra-bookmark-del" data-del-id="'+esc(b.id)+'" title="Remove">×</button>' | ||
+ '</div>'; | + '</div>'; | ||
}); | }); | ||
$paneBookmarks.html(html); | $paneBookmarks.html(html); | ||
} | } | ||
function scrollToHighlight(id) { | function scrollToHighlight(id) { | ||
var el = document.querySelector('[data-gra-id="' + id + '"]'); | var el = document.querySelector('[data-gra-id="'+id+'"]'); | ||
if (!el) return; | if (!el) return; | ||
el.scrollIntoView({ behavior:'smooth', block:'center' }); | el.scrollIntoView({behavior:'smooth', block:'center'}); | ||
el.classList.add('gra-hl-active'); | el.classList.add('gra-hl-active'); | ||
setTimeout(function(){ el.classList.remove('gra-hl-active'); }, 2000); | setTimeout(function(){ el.classList.remove('gra-hl-active'); }, 2000); | ||
} | } | ||
function wireEvents() { | |||
/* Suppress native context menu inside article content (Android/desktop) */ | |||
document.addEventListener('contextmenu', function(e) { | |||
var tag = e.target.tagName; | |||
if (tag === 'INPUT' || tag === 'TEXTAREA' || tag === 'SELECT') return; | |||
var c = document.querySelector(CONTENT_SEL); | |||
if (c && c.contains(e.target)) e.preventDefault(); | |||
}, { passive: false }); | |||
/* Desktop mouseup */ | |||
$(document).on('mouseup', function(e){ | |||
if (e.button !== 0) return; | |||
if (_mobile) return; | |||
setTimeout(tryShowActions, 20); | |||
}); | |||
/* Separate timers so mobile + desktop never clobber each other */ | |||
var _selTimer = null; /* desktop debounce */ | |||
var _mobShowTimer = null; /* mobile show-on-touchend */ | |||
/* Mobile: show fab quickly after finger lifts (selection settled). | |||
180ms feels instant while still letting the range stabilise. */ | |||
document.addEventListener('touchend', function(e) { | |||
if (!_mobile) return; | |||
if ($fab[0] && $fab[0].contains(e.target)) return; | |||
clearTimeout(_mobShowTimer); | |||
_mobShowTimer = setTimeout(function() { | |||
var sel = window.getSelection(); | |||
if (!sel || sel.isCollapsed || !sel.toString().trim()) return; | |||
tryShowActions(); | |||
}, 180); | |||
}, { passive: true }); | |||
// | /* Mobile: only HIDE the fab when selection is cleared while it's visible. | ||
(Reposition isn't needed now that the bar is docked, and re-running | |||
if ( | showFab here was causing the lag/flicker.) */ | ||
document.addEventListener('selectionchange', function() { | |||
if (!_mobile) return; | |||
if (!$fab.hasClass('gra-fab-visible')) return; | |||
var sel = window.getSelection(); | |||
if (!sel || sel.isCollapsed || !sel.toString().trim()) { | |||
clearTimeout(_mobShowTimer); | |||
hideActions(); | |||
} | |||
}); | }); | ||
// | /* selectionchange debounced (desktop only) */ | ||
document.addEventListener('selectionchange', function() { | document.addEventListener('selectionchange', function() { | ||
if (_mobile) return; | |||
_selVersion++; | _selVersion++; | ||
clearTimeout( | clearTimeout(_selTimer); | ||
var v = _selVersion; | var v = _selVersion; | ||
_selTimer = setTimeout(function(){ | |||
if ( v !== _selVersion ) return; | if (v !== _selVersion) return; | ||
if ( _fabSelVer === v ) return; | if (_fabSelVer === v) return; | ||
tryShowActions(); | |||
}, | }, 600); | ||
}); | }); | ||
/ | /* ── KEY FIX: fab touchstart sets flag to prevent hideActions ── */ | ||
$fab[0].addEventListener('touchstart', function(e) { | |||
_fabTouched = true; | |||
/* Don't propagate to document handler */ | |||
e.stopPropagation(); | |||
}, { passive: true }); | }, { passive: true }); | ||
/ | /* Click outside → hide actions (blocked if fab was touched) */ | ||
$( document ).on('mousedown touchstart', function(e){ | $(document).on('mousedown touchstart', function(e){ | ||
if (_fabTouched) { _fabTouched = false; return; } | |||
var t = e.target; | var t = e.target; | ||
if ( $fab[0] && $fab[0].contains(t) ) return; | if ($fab[0] && $fab[0].contains(t)) return; | ||
if ( $fbComposer[0] && $fbComposer[0].contains(t) ) return; | if ($fbComposer[0] && $fbComposer[0].contains(t)) return; | ||
if ( $ntComposer[0] && $ntComposer[0].contains(t) ) return; | if ($ntComposer[0] && $ntComposer[0].contains(t)) return; | ||
if ( $bmComposer[0] && $bmComposer[0].contains(t) ) return; | if ($bmComposer[0] && $bmComposer[0].contains(t)) return; | ||
hideActions(); | |||
}); | }); | ||
/ | /* ── FAB buttons — use touchend for mobile, click for desktop ── */ | ||
function fabAction(btnId, action) { | |||
var el = document.getElementById(btnId); | |||
if (!el) return; | |||
/* touchend: fires before document touchstart clears _selRange */ | |||
el.addEventListener('touchend', function(e) { | |||
e.preventDefault(); | |||
e.stopPropagation(); | |||
if (!_selRange && !reCaptureFromDOM()) return; | |||
action(); | |||
}, { passive: false }); | |||
/* click: for desktop */ | |||
el.addEventListener('click', function(e) { | |||
e.preventDefault(); | |||
e.stopPropagation(); | |||
if (!_selRange && !reCaptureFromDOM()) return; | |||
action(); | |||
}); | |||
} | |||
fabAction('gra-fab-note', openNoteComposer); | |||
fabAction('gra-fab-bookmark', openBookmarkComposer); | |||
fabAction('gra-fab-feedback', openFeedbackComposer); | |||
document.getElementById('gra-fab-search').addEventListener('touchend', function(e) { | |||
e.preventDefault(); e.stopPropagation(); | e.preventDefault(); e.stopPropagation(); | ||
if ( | var q = _selText; | ||
hideActions(); | |||
}); | _selRange = null; _selText = ''; _selRect = null; | ||
if (q && window.showSearchDialog) { window.showSearchDialog(q); } | |||
}, { passive: false }); | |||
document.getElementById('gra-fab-search').addEventListener('click', function(e) { | |||
e.preventDefault(); e.stopPropagation(); | e.preventDefault(); e.stopPropagation(); | ||
var q = _selText; | |||
hideActions(); | |||
_selRange = null; _selText = ''; _selRect = null; | |||
if (q && window.showSearchDialog) { window.showSearchDialog(q); } | |||
else if (q) { $(document).trigger($.Event('keydown', {ctrlKey:true, key:'k', keyCode:75})); } | |||
if ( | |||
}); | }); | ||
// | /* ── Dismiss button: hide toolbar + clear selection (mobile) ── */ | ||
$fbIssueType.on('change', function(){ | (function () { | ||
var dismissEl = document.getElementById('gra-fab-dismiss'); | |||
if (!dismissEl) return; | |||
$( '#gra-fb-cancel, #gra-fb-close' ).on('click', | function doDismiss(e) { | ||
e.preventDefault(); e.stopPropagation(); | |||
hideActions(); | |||
_selRange = null; _selText = ''; _selRect = null; | |||
if (window.getSelection) { | |||
var s = window.getSelection(); | |||
if (s && s.removeAllRanges) s.removeAllRanges(); | |||
} | |||
} | |||
dismissEl.addEventListener('touchend', doDismiss, { passive: false }); | |||
dismissEl.addEventListener('click', doDismiss); | |||
}()); | |||
/* Feedback composer */ | |||
$fbIssueType.on('change', function(){ $fbSubmit.prop('disabled', !$(this).val()); }); | |||
$('#gra-fb-cancel, #gra-fb-close').on('click', closeFeedbackComposer); | |||
$fbSubmit.on('click', submitFeedback); | $fbSubmit.on('click', submitFeedback); | ||
$fbText.on('keydown', function(e){ | $fbText.on('keydown', function(e){ if(e.key==='Escape') closeFeedbackComposer(); }); | ||
/ | /* Note composer */ | ||
$ntInput.on('input', function(){ | $ntInput.on('input', function(){ $ntSubmit.prop('disabled', !$(this).val().trim()); }); | ||
$('#gra-nt-cancel').on('click', closeNoteComposer); | |||
$( '#gra-nt-cancel' ).on('click', | |||
$ntSubmit.on('click', submitNote); | $ntSubmit.on('click', submitNote); | ||
$ntInput.on('keydown', function(e){ | $ntInput.on('keydown', function(e){ | ||
if ((e.ctrlKey||e.metaKey) && e.key==='Enter') submitNote(); | if ((e.ctrlKey||e.metaKey) && e.key==='Enter') submitNote(); | ||
if (e.key==='Escape') | if (e.key==='Escape') closeNoteComposer(); | ||
}); | }); | ||
/ | /* Bookmark composer */ | ||
$( '#gra-bm-cancel' ).on('click', | $('#gra-bm-cancel').on('click', closeBookmarkComposer); | ||
$bmSubmit.on('click', submitBookmark); | $bmSubmit.on('click', submitBookmark); | ||
$bmInput.on('keydown', function(e){ | $bmInput.on('keydown', function(e){ | ||
if (e.key==='Enter') submitBookmark(); | if (e.key==='Enter') submitBookmark(); | ||
if (e.key==='Escape') | if (e.key==='Escape') closeBookmarkComposer(); | ||
}); | }); | ||
// | /* Panel */ | ||
$( '#gra-panel-close' ).on('click', closePanel); | $('#gra-panel-close').on('click', closePanel); | ||
$backdrop.on('click | $backdrop.on('click touchend', function(e){ | ||
e.preventDefault(); | |||
if ($fbComposer.hasClass('gra-composer-visible')) closeFeedbackComposer(); | |||
else if ($ntComposer.hasClass('gra-composer-visible')) closeNoteComposer(); | |||
else if ($bmComposer.hasClass('gra-composer-visible')) closeBookmarkComposer(); | |||
else closePanel(); | |||
}); | |||
$tabNotes.on('click', function(){ switchTab('notes'); }); | $tabNotes.on('click', function(){ switchTab('notes'); }); | ||
$tabBookmarks.on('click', function(){ switchTab('bookmarks'); }); | $tabBookmarks.on('click', function(){ switchTab('bookmarks'); }); | ||
$paneNotes.on('click', '.gra-note-card', function(e){ | $paneNotes.on('click', '.gra-note-card', function(e){ | ||
if ($( e.target ).hasClass('gra-note-del')) return; | if ($(e.target).hasClass('gra-note-del')) return; | ||
var id = $( this ).attr('data-gra-id'); | var id = $(this).attr('data-gra-id'); | ||
if (id) { closePanel(); scrollToHighlight(id); } | if (id) { closePanel(); scrollToHighlight(id); } | ||
}); | }); | ||
$paneNotes.on('click', '.gra-note-del', function(e){ | $paneNotes.on('click', '.gra-note-del', function(e){ | ||
e.stopPropagation(); | e.stopPropagation(); | ||
var id = $( this ).attr('data-del-id'); | var id = $(this).attr('data-del-id'); | ||
if (id) deleteNote(id); | if (id) deleteNote(id); | ||
}); | }); | ||
$paneBookmarks.on('click', '.gra-bookmark-card', function(e){ | $paneBookmarks.on('click', '.gra-bookmark-card', function(e){ | ||
if ($( e.target ).hasClass('gra-bookmark-del')) return; | if ($(e.target).hasClass('gra-bookmark-del')) return; | ||
var id = $( this ).attr('data-gra-id'); | var id = $(this).attr('data-gra-id'); | ||
if (id) { closePanel(); scrollToHighlight(id); } | if (id) { closePanel(); scrollToHighlight(id); } | ||
}); | }); | ||
$paneBookmarks.on('click', '.gra-bookmark-del', function(e){ | $paneBookmarks.on('click', '.gra-bookmark-del', function(e){ | ||
e.stopPropagation(); | e.stopPropagation(); | ||
var id = $( this ).attr('data-del-id'); | var id = $(this).attr('data-del-id'); | ||
if (id) deleteBookmark(id); | if (id) deleteBookmark(id); | ||
}); | }); | ||
$(CONTENT_SEL).on('click', '.gra-note-highlight', function(){ | |||
$( CONTENT_SEL ).on('click', '.gra-note-highlight', function(){ | var id = $(this).attr('data-gra-id'); | ||
var id = $( this ).attr('data-gra-id'); | |||
openPanel('notes'); | openPanel('notes'); | ||
setTimeout(function(){ | setTimeout(function(){ | ||
| Line 746: | Line 731: | ||
}, 100); | }, 100); | ||
}); | }); | ||
$( CONTENT_SEL ).on('click', '.gra-bookmark-highlight', function(){ | $(CONTENT_SEL).on('click', '.gra-bookmark-highlight', function(){ | ||
var id = $( this ).attr('data-gra-id'); | var id = $(this).attr('data-gra-id'); | ||
openPanel('bookmarks'); | openPanel('bookmarks'); | ||
setTimeout(function(){ | setTimeout(function(){ | ||
| Line 755: | Line 740: | ||
}); | }); | ||
$(document).on('keydown', function(e){ | |||
$( document ).on('keydown', function(e){ | |||
if (e.key !== 'Escape') return; | if (e.key !== 'Escape') return; | ||
if ($fbComposer.hasClass('gra-composer-visible')) | if ($fbComposer.hasClass('gra-composer-visible')) closeFeedbackComposer(); | ||
else if ($ntComposer.hasClass('gra-composer-visible')) | else if ($ntComposer.hasClass('gra-composer-visible')) closeNoteComposer(); | ||
else if ($bmComposer.hasClass('gra-composer-visible')) | else if ($bmComposer.hasClass('gra-composer-visible')) closeBookmarkComposer(); | ||
else closePanel(); | else closePanel(); | ||
}); | }); | ||
} | } | ||
function persistNoteHighlight(id, quote) { | function persistNoteHighlight(id, quote) { | ||
| Line 787: | Line 767: | ||
if (!needle) return; | if (!needle) return; | ||
var range = findTextInContent(document.querySelector(CONTENT_SEL), needle); | var range = findTextInContent(document.querySelector(CONTENT_SEL), needle); | ||
if (range) | if (!range) return; | ||
var sp = document.createElement('span'); | |||
sp.className = 'gra-note-highlight'; | |||
sp.setAttribute('data-gra-id', h.id); | |||
try { range.surroundContents(sp); } catch(e){} | |||
}); | }); | ||
} | } | ||
| Line 803: | Line 782: | ||
if (!needle) return; | if (!needle) return; | ||
var found = findTextInContent(document.querySelector(CONTENT_SEL), needle); | var found = findTextInContent(document.querySelector(CONTENT_SEL), needle); | ||
if (found) | if (!found) return; | ||
var sp = document.createElement('span'); | |||
sp.className = 'gra-bookmark-highlight'; | |||
sp.setAttribute('data-gra-id', b.id); | |||
sp.setAttribute('data-gra-name', b.name); | |||
try { found.surroundContents(sp); } catch(e){} | |||
}); | }); | ||
} | } | ||
function findTextInContent(root, needle) { | function findTextInContent(root, needle) { | ||
if (!root) return null; | if (!root || !needle) return null; | ||
var text = root.textContent || ''; | var text = root.textContent || ''; | ||
var idx = text.indexOf(needle); | var idx = text.indexOf(needle); | ||
| Line 828: | Line 806: | ||
} | } | ||
if (!startNode || !endNode) return null; | if (!startNode || !endNode) return null; | ||
var r = document.createRange(); | try { | ||
var r = document.createRange(); | |||
r.setStart(startNode, startOffset); | |||
return | r.setEnd(endNode, endOffset); | ||
return r; | |||
} catch(e){ return null; } | |||
} | } | ||
$(function() { | |||
_mobile = window.innerWidth < 768 || 'ontouchstart' in window; | |||
window.addEventListener('resize', function(){ | |||
_mobile = window.innerWidth < 768 || 'ontouchstart' in window; | |||
}); | |||
buildDom(); | buildDom(); | ||
wireEvents(); | wireEvents(); | ||
loadNotes(); | loadNotes(); | ||
loadBookmarks(); | loadBookmarks(); | ||
restoreNoteHighlights(); | setTimeout(function(){ | ||
try { restoreNoteHighlights(); } catch(e){} | |||
try { restoreBookmarkHighlights(); } catch(e){} | |||
}, 500); | |||
}); | }); | ||
}() ); | }() ); | ||