From 417fa6930e643353c685c91f2db2cd7bbc6a725c Mon Sep 17 00:00:00 2001 From: "Sebastian Rose, Hannover, Germany" Date: Thu, 18 Jun 2009 23:47:42 +0200 Subject: [PATCH] Remove org-tags from the local toc. * The HTML tags where removed since ages. So now we remove the tags entirely. * Removed duplicate lines. * Default view in constructor never existed. --- code/org-info-js/org-info-src.js | 30 +++++++++++++++++++----------- code/org-info-js/org-info.js | 9 +++++---- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/code/org-info-js/org-info-src.js b/code/org-info-js/org-info-src.js index 0aec557..56ccfe8 100644 --- a/code/org-info-js/org-info-src.js +++ b/code/org-info-js/org-info-src.js @@ -341,7 +341,7 @@ var org_html_manager = { ALL_VIEW: 2, // plain view show all INFO_VIEW: 3, // We're in info view mode SLIDE_VIEW: 4, // Slidemode. - VIEW: this.OVER_VIEW, // Default view mode (s. setup()) + VIEW: this.CONTENT_VIEW, // Default view mode (s. setup()) LOCAL_TOC: false, // Create sub indexes (s. setup()): "0", "1" "above", "below" (==1, default) LINK_HOME: 0, // Link to this.LINK_HOME? LINK_UP: 0, // Link to this.LINK_UP? @@ -349,7 +349,6 @@ var org_html_manager = { RUN_MAX: 1200, // Max attempts to scan (results in ~2 minutes) RUN_INTERVAL: 100, // Interval of scans in milliseconds. DEBUG: 0, // Gather and show debugging info? - WINDOW_BORDER: false, // Draw a border aroung info window HIDE_TOC: false, // Hide the table of contents. TOC_DEPTH: 0, // Level to cut the table of contents. No cutting if 0. STARTUP_MESSAGE: 0, // Show info at startup? @@ -363,9 +362,11 @@ var org_html_manager = { INNER_TITLE: false, // The cloned title in sec-1. LOAD_CHECK: null, // Saves the setTimeout()'s value WINDOW: null, // A div to display info view mode + WINDOW_BORDER: false, // Draw a border aroung info window SECS: new Array(), // The OrgNode tree REGEX: /(#)(.*$)/, // identify a section link in toc UNTAG_REGEX: /<[^>]+>/i, // Remove HTML tags + ORGTAG_REGEX: /^(.*)(]>[^<]<\/span>)+<\/span>/i, // Remove Org tags TRIMMER: /^(\s*)([^\s].*)(\s*)$/, // Trim FNREF_REGEX: /(fnr\.*)/, // Footnote ref TOC: null, // toc. @@ -379,7 +380,6 @@ var org_html_manager = { DEBUG_FATAL: 1, // Fatale Fehler anzeigen. DEBUG_BUILD: 1 << 5, DEBUG_TREE: 1 << 10, - WINDOW_BORDER: false, // Draw a border aroung info window // Commands: CONSOLE: null, // The div containing the minibuffer. CONSOLE_INPUT: null, @@ -440,7 +440,6 @@ var org_html_manager = { case 'VIEW': case 'HIDE_TOC': case 'LOCAL_TOC': - case 'VIEW': case 'OCCUR': this.set(k, decodeURIComponent(v)); break; @@ -475,14 +474,23 @@ var org_html_manager = { return RegExp.$2; }, - removeTags: function (str) + removeTags: function (s) { - if(str) { - while(str.match(this.UNTAG_REGEX)) { - str = str.substr(0, str.indexOf('<')) + str.substr(str.indexOf('>') + 1); - if(this.DEBUG > 5) this.debug += str + "\n"; + if(s) { + while(s.match(this.UNTAG_REGEX)) { + s = s.substr(0, s.indexOf('<')) + s.substr(s.indexOf('>') + 1); + if(this.DEBUG > 5) this.debug += s + "\n"; }} - return str; + return s; + }, + + removeOrgTags: function (s) + { + if(s.match(this.ORGTAG_REGEX)) { + var matches = this.REGEX.exec(s); + return matches[1]; + } + return s; }, @@ -941,7 +949,7 @@ var org_html_manager = { for(var k=0; k < this.SECS[i].children.length; ++k) { html += '
  • ' - +this.removeTags(this.SECS[i].children[k].heading.innerHTML)+'
    • '; + +this.removeOrgTags(this.SECS[i].children[k].heading.innerHTML)+''; } html += ''; // '; navi2.innerHTML = html; diff --git a/code/org-info-js/org-info.js b/code/org-info-js/org-info.js index b70bd3e..ff4f08c 100644 --- a/code/org-info-js/org-info.js +++ b/code/org-info-js/org-info.js @@ -34,9 +34,9 @@ OrgNode.prototype.setState=function(b){for(var a=0;a]+>/i,TRIMMER:/^(\s*)([^\s].*)(\s*)$/,FNREF_REGEX:/(fnr\.*)/,TOC:null,runs:0,HISTORY:new Array(50),HIST_INDEX:0,SKIP_HISTORY:false,FIXED_TOC:false,debug:"",DEBUG_FATAL:1,DEBUG_BUILD:1<<5,DEBUG_TREE:1<<10,WINDOW_BORDER:false,CONSOLE:null,CONSOLE_INPUT:null,CONSOLE_LABEL:null,CONSOLE_OFFSET:"50px",OCCUR:"",SEARCH_REGEX:"",SEARCH_HL_REG:new RegExp('()([^<]*?)()',"gi"),console_first_time:true,MESSAGING:0,MESSAGING_INPLACE:1,MESSAGING_TOP:2,HELPING:false,READING:false,READ_COMMAND:"",READ_COMMAND_NULL:"_0",READ_COMMAND_HTML_LINK:"_1",READ_COMMAND_ORG_LINK:"_2",READ_COMMAND_PLAIN_URL_LINK:"_03",LAST_WAS_SEARCH:false,last_view_mode:0,TAB_INDEX:1000,SEARCH_HIGHLIGHT_ON:false,TAGS:{},SORTED_TAGS:new Array(),TAGS_INDEX:null,CLICK_TIMEOUT:null,SECNUM_MAP:{},SECNUM_REGEX:/^section-number-(\d)+/,setup:function(){if(location.search){var d=location.search.substring(1).split("&"); +};var org_html_manager={MOUSE_HINT:0,BODY:null,PLAIN_VIEW:0,CONTENT_VIEW:1,ALL_VIEW:2,INFO_VIEW:3,SLIDE_VIEW:4,VIEW:this.CONTENT_VIEW,LOCAL_TOC:false,LINK_HOME:0,LINK_UP:0,LINKS:"",RUN_MAX:1200,RUN_INTERVAL:100,DEBUG:0,HIDE_TOC:false,TOC_DEPTH:0,STARTUP_MESSAGE:0,POSTAMBLE:null,BASE_URL:document.URL,START_SECTION:0,ROOT:null,NODE:null,TITLE:null,INNER_TITLE:false,LOAD_CHECK:null,WINDOW:null,WINDOW_BORDER:false,SECS:new Array(),REGEX:/(#)(.*$)/,UNTAG_REGEX:/<[^>]+>/i,ORGTAG_REGEX:/^(.*)(]>[^<]<\/span>)+<\/span>/i,TRIMMER:/^(\s*)([^\s].*)(\s*)$/,FNREF_REGEX:/(fnr\.*)/,TOC:null,runs:0,HISTORY:new Array(50),HIST_INDEX:0,SKIP_HISTORY:false,FIXED_TOC:false,debug:"",DEBUG_FATAL:1,DEBUG_BUILD:1<<5,DEBUG_TREE:1<<10,CONSOLE:null,CONSOLE_INPUT:null,CONSOLE_LABEL:null,CONSOLE_OFFSET:"50px",OCCUR:"",SEARCH_REGEX:"",SEARCH_HL_REG:new RegExp('()([^<]*?)()',"gi"),console_first_time:true,MESSAGING:0,MESSAGING_INPLACE:1,MESSAGING_TOP:2,HELPING:false,READING:false,READ_COMMAND:"",READ_COMMAND_NULL:"_0",READ_COMMAND_HTML_LINK:"_1",READ_COMMAND_ORG_LINK:"_2",READ_COMMAND_PLAIN_URL_LINK:"_03",LAST_WAS_SEARCH:false,last_view_mode:0,TAB_INDEX:1000,SEARCH_HIGHLIGHT_ON:false,TAGS:{},SORTED_TAGS:new Array(),TAGS_INDEX:null,CLICK_TIMEOUT:null,SECNUM_MAP:{},SECNUM_REGEX:/^section-number-(\d)+/,setup:function(){if(location.search){var d=location.search.substring(1).split("&"); for(var c=0;cUp / ':"")+((this.LINK_HOME&&this.LINK_HOME!=document.URL)?'HOME / ':"")+'HELP / '; this.LOAD_CHECK=window.setTimeout("OrgHtmlManagerLoadCheck()",50);},trim:function(a){var b=this.TRIMMER.exec(a); return RegExp.$2;},removeTags:function(a){if(a){while(a.match(this.UNTAG_REGEX)){a=a.substr(0,a.indexOf("<"))+a.substr(a.indexOf(">")+1); -if(this.DEBUG>5){this.debug+=a+"\n";}}}return a;},init:function(){this.runs++;this.BODY=document.getElementById("content"); +if(this.DEBUG>5){this.debug+=a+"\n";}}}return a;},removeOrgTags:function(a){if(a.match(this.ORGTAG_REGEX)){var b=this.REGEX.exec(a); +return b[1];}return a;},init:function(){this.runs++;this.BODY=document.getElementById("content"); if(null==this.BODY){if(5>this.runs){this.LOAD_CHECK=window.setTimeout("OrgHtmlManagerLoadCheck()",this.RUN_INTERVAL); return;}else{this.BODY=document.getElementsByTagName("body")[0];}}if(!this.WINDOW){this.WINDOW=document.createElement("div"); if(this.WINDOW_BORDER){this.WINDOW.style.border="1px dashed black";}}this.WINDOW.style.marginBottom="40px"; @@ -124,7 +125,7 @@ if(this.SECS[d].folder){this.SECS[d].div.insertBefore(this.SECS[d].buttons,this. }else{if(this.SECS[d].div.hasChildNodes()){this.SECS[d].div.insertBefore(this.SECS[d].buttons,this.SECS[d].div.firstChild); }}if(!this.VIEW_BUTTONS){OrgNode.hideElement(this.SECS[d].buttons);}this.SECS[d].navigation=c; if(0'+this.removeTags(this.SECS[d].children[b].heading.innerHTML)+""; +c="Contents:
    ";a.innerHTML=c;if("above"==this.LOCAL_TOC){if(this.SECS[d].folder){this.SECS[d].folder.insertBefore(a,this.SECS[d].folder.firstChild); }else{this.SECS[d].div.insertBefore(a,this.SECS[d].div.getElementsByTagName("h"+this.SECS[d].depth)[0].nextSibling); }}else{if(this.SECS[d].folder){this.SECS[d].folder.appendChild(a);}else{this.SECS[d].div.appendChild(a); -- 2.11.4.GIT