Commit b18b7372 authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Reimplemented history using hash-URL-s. 

Removed .htaccess file, class URL-s are now in form:

    apidocs/#/api/Ext.Ajax
parent 5ebc0278

lib/jsduck/app.rb

+2 −6
Original line number Diff line number Diff line
@@ -221,12 +221,8 @@ module JsDuck 
    def link_template(template_dir, dir)

      puts "Linking template files to #{dir}..." if @verbose

      FileUtils.mkdir(dir)

      # Use File::FNM_DOTMATCH to include .htaccess

      Dir.glob(template_dir + "/*", File::FNM_DOTMATCH).each do |file|

        basename = File.basename(file)

        unless basename == "." || basename == ".."

          File.symlink(File.expand_path(file), dir+"/"+basename)

        end

      Dir.glob(template_dir + "/*").each do |file|

        File.symlink(File.expand_path(file), dir+"/"+File.basename(file))

      end

      init_output_dirs(dir)

    end

template/.htaccess

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
RewriteEngine on

RewriteRule ^api:(.*)$ index.html [QSA]

template/js/App.js

+1 −2
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ Ext.define("Docs.App", { 
     * @return {String} URL

     */

    getBaseUrl: function() {

        var url = document.location.href;

        return url.replace(/\/api:.*/, "").replace(/\/$/, "");

        return document.location.href.replace(/#.*/, "");

    }

});

template/js/History.js

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ Ext.define("Docs.History", { 
            return false;

        }, false);



        var matches = document.location.href.match(/\/api:(.*)/);

        var matches = document.location.hash.match(/#\/api\/(.*)/);

        if (matches) {

            var className = matches[1];

            getDocClass(className, true);
@@ -30,7 +30,7 @@ Ext.define("Docs.History", { 
        if (!this.compliant) {

            return;

        }

        var fullUrl = Docs.App.getBaseUrl() + "/api:" + className;

        var fullUrl = Docs.App.getBaseUrl() + "#/api/" + className;

        window.history.pushState({docClass: className}, '', fullUrl);

    }

});