Commit 9ebe9265 authored by Nick Poulden's avatar Nick Poulden
Browse files

Scrollbar fix for Chrome on examples iframes

parent 9b9ed6e5

template/app/controller/Classes.js

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ Ext.define('Docs.controller.Classes', { 
    loadIndex: function(noHistory) {

        this.activeUrl = "";

        if (!noHistory) {

            Docs.History.push("");

            Docs.History.push("#/api");

        }

        this.getViewport().setPageTitle("");

        Ext.getCmp('doctabs').activateTab('#/api');

template/app/controller/Examples.js

+4 −4
Original line number Diff line number Diff line
@@ -34,15 +34,15 @@ Ext.define('Docs.controller.Examples', { 
    },



    loadExample: function(url, noHistory) {

        Ext.getCmp('card-panel').layout.setActiveItem('example');

        Ext.getCmp('tree-container').layout.setActiveItem(1);



        if (this.activeUrl === url) return;

        this.activeUrl = url;



        noHistory || Docs.History.push(url);



        Ext.getCmp('card-panel').layout.setActiveItem('example');

        Ext.getCmp('tree-container').layout.setActiveItem(1);



        Ext.get('exampleIframe').dom.setAttribute('src', 'extjs/' + url);

        var ifr = document.getElementById("exampleIframe");

        ifr.contentWindow.location.replace('extjs/' + url);

    }

});

template/app/view/Tabs.js

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ Ext.define('Docs.view.Tabs', { 
                Docs.App.getController('Classes').loadIndex();

            } else {

                if (idx == this.openTabs.length) idx -= 1;

                Docs.App.getController('Classes').handleUrlClick(this.openTabs[idx], {});

                window.location = this.openTabs[idx];

            }

        }

    }

template/app/view/Viewport.js

+4 −3
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ Ext.define('Docs.view.Viewport', { 
                    {

                        region: 'west',

                        id: 'tree-container',

                        cls: 'iScroll',

                        border: 1,

                        layout: 'card',

                        resizable: true,
@@ -80,7 +81,6 @@ Ext.define('Docs.view.Viewport', { 
                        hideCollapseTool: true,

                        animCollapse: true,

                        bodyPadding: '14 9',

                        // autoHeight: true,

                        width: 220,

                        items: [

                            {
@@ -132,7 +132,8 @@ Ext.define('Docs.view.Viewport', { 
                                {

                                    autoScroll: true,

                                    xtype: 'container',

                                    id: 'guide'

                                    id: 'guide',

                                    cls: 'iScroll'

                                },

                                {

                                    xtype: 'container',
@@ -146,7 +147,7 @@ Ext.define('Docs.view.Viewport', { 
                                    id: 'example',

                                    xtype: 'container',

                                    layout: 'fit',

                                    html: '<iframe style="width: 100%; height: 100%; border: 0;" id="exampleIframe" src="egIframe.html" scrolling="yes"></iframe>'

                                    html: '<iframe style="width: 100%; height: 100%; border: 0;" id="exampleIframe" src="egIframe.html"></iframe>'

                                },

                                {

                                    xtype: 'videoindex',

template/app/view/cls/Index.js

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
Ext.define('Docs.view.cls.Index', {

    extend: 'Ext.container.Container',

    alias : 'widget.classindex',

    cls: 'class-list',

    cls: 'class-list iScroll',



    initComponent: function() {

        this.tpl = new Ext.XTemplate(