diff --git a/docs/tutorial/conf_files/volvox.json b/docs/tutorial/conf_files/volvox.json index 4de722d877..0befd4bf24 100644 --- a/docs/tutorial/conf_files/volvox.json +++ b/docs/tutorial/conf_files/volvox.json @@ -82,7 +82,7 @@ "label" : "Open popup with XHR HTML snippet (btw this is feature {name})", "title": "function(track,feature,div) { return 'Random XHR HTML '+Math.random()+' title!'; }", "iconClass" : "dijitIconDatabase", - "action": "snippetDialog", + "action": "xhrDialog", "url" : "sample_data/test_snippet.html?featurename={name}:{start}-{end}" }, { diff --git a/src/JBrowse/View/Track/HTMLFeatures.js b/src/JBrowse/View/Track/HTMLFeatures.js index 26ed176404..92d38bded5 100644 --- a/src/JBrowse/View/Track/HTMLFeatures.js +++ b/src/JBrowse/View/Track/HTMLFeatures.js @@ -888,10 +888,10 @@ var HTMLFeatures = declare( BlockBased, }; var dialog; - // if dialog == snippet, open the link in a dialog + // if dialog == xhr, open the link in a dialog // with the html from the URL just shoved in it - if( type == 'snippet' || type == 'content' ) { - if( type == 'snippet' ) + if( type == 'xhr' || type == 'content' ) { + if( type == 'xhr' ) dialogOpts.href = spec.url; else dialogOpts.content = this._evalConf( context, spec.content, null ); @@ -968,15 +968,15 @@ var HTMLFeatures = declare( BlockBased, iframe: 'iframeDialog', contentdialog: 'contentDialog', content: 'content', - snippetdialog: 'snippetDialog', - snippet: 'snippet', + xhrdialog: 'xhrDialog', + xhr: 'xhr', newwindow: 'newWindow', "_blank": 'newWindow' }[(''+spec.action).toLowerCase()]; if( spec.action == 'newWindow' ) window.open( url, '_blank' ); - else if( spec.action in { iframeDialog:1, contentDialog:1, snippetDialog:1} ) + else if( spec.action in { iframeDialog:1, contentDialog:1, xhrDialog:1} ) track._openDialog( spec, evt, ctx ); } else if( typeof spec.action == 'function' ) {