Skip to content
This repository was archived by the owner on Feb 1, 2018. It is now read-only.

Commit 32f1d6c

Browse files
farhan687farhan687
committed
add timeout to make sure template file is loaded before urlController
1 parent f5e05b8 commit 32f1d6c

1 file changed

Lines changed: 67 additions & 66 deletions

File tree

‎scripts/docbase.js‎

Lines changed: 67 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -462,79 +462,80 @@
462462
};
463463
};
464464

465-
Route.URLCtrl = function($scope, $location, $filter, data, commits) {
466-
$location.path(data.locationPath);
467-
$scope.index = false;
468-
$scope.versions = data.versions;
469-
$scope.currentVersion = data.currentVersion;
470-
$scope.map = data.map;
471-
$scope.github = data.github;
472-
$scope.navbarHtml = Docbase.options.navbarHtml;
473-
$scope.logoSrc = Docbase.options.logoSrc;
474-
475-
function versionIn(folder) {
476-
if (folder.name === data.currentFolder) {
477-
$scope.indexList = folder.files;
478-
}
479-
}
480-
//If index is true
481-
if (data.index) {
482-
$scope.index = true;
483-
$scope.currentFolder = data.currentFolder;
484-
$scope.indexList = [];
485-
486-
for (var version in data.map) {
487-
if (version === data.currentVersion) {
488-
if (data.map[version] !== null)
489-
for (var j = 0; j < data.map[version].length; j++) {
490-
versionIn(data.map[version][j]);
491-
}
465+
Route.URLCtrl = function($scope, $location, $filter, data, commits, $timeout) {
466+
$timeout(function() {
467+
$location.path(data.locationPath);
468+
$scope.index = false;
469+
$scope.versions = data.versions;
470+
$scope.currentVersion = data.currentVersion;
471+
$scope.map = data.map;
472+
$scope.github = data.github;
473+
$scope.navbarHtml = Docbase.options.navbarHtml;
474+
$scope.logoSrc = Docbase.options.logoSrc;
475+
476+
function versionIn(folder) {
477+
if (folder.name === data.currentFolder) {
478+
$scope.indexList = folder.files;
492479
}
493480
}
494-
} else {
495-
var contribut_array = [];
496-
497-
if (!data.fail) {
498-
var content = data.markdown;
499-
$('[role="flatdoc-content"]').html(content.content.find('>*'));
500-
$('[role="flatdoc-menu"]').html(Flatdoc.menuView(content.menu));
481+
//If index is true
482+
if (data.index) {
483+
$scope.index = true;
484+
$scope.currentFolder = data.currentFolder;
485+
$scope.indexList = [];
486+
487+
for (var version in data.map) {
488+
if (version === data.currentVersion) {
489+
if (data.map[version] !== null)
490+
for (var j = 0; j < data.map[version].length; j++) {
491+
versionIn(data.map[version][j]);
492+
}
493+
}
494+
}
495+
} else {
496+
var contribut_array = [];
497+
if (!data.fail) {
498+
var content = data.markdown;
499+
$('[role="flatdoc-content"]').html(content.content.find('>*'));
500+
$('[role="flatdoc-menu"]').html(Flatdoc.menuView(content.menu));
501501

502-
jWindow.trigger('flatdoc:ready');
503-
}
502+
jWindow.trigger('flatdoc:ready');
503+
}
504504

505-
var extra_container = $("<div>").addClass('extra_container');
506-
if (commits.status == 200 && commits.data && commits.data.length) {
507-
var commits_data = commits.data;
508-
var commiter_data = $filter('date')(commits.data[0].commit.committer.date, 'mediumDate');
509-
var last_date = $('<span>').addClass('pull-right modified-date').html('Last Modified On : <a href="' + commits.data[0].html_url + '">' + commiter_data + '</a>');
510-
511-
var contributors_data = commits_data;
512-
var contributors = $('<div>').addClass('contributor-container');
513-
for (var i = 0; i < contributors_data.length; i++) {
514-
var contributor_d = contributors_data[i].committer;
515-
if (contributor_d && jQuery.inArray(contributor_d.login, contribut_array) == -1) {
516-
contribut_array.push(contributor_d.login);
517-
var contributor_img = $('<img>').addClass('contributor_img img-rounded').attr({
518-
'src': contributor_d.avatar_url,
519-
'alt': contributor_d.login
520-
});
521-
var contributor = $('<a>').addClass('contributor').attr({
522-
'href': contributor_d.html_url,
523-
'title': contributor_d.login,
524-
'target': '_blank'
525-
}).append(contributor_img);
526-
contributors.append(contributor);
505+
var extra_container = $("<div>").addClass('extra_container');
506+
if (commits.status == 200 && commits.data && commits.data.length) {
507+
var commits_data = commits.data;
508+
var commiter_data = $filter('date')(commits.data[0].commit.committer.date, 'mediumDate');
509+
var last_date = $('<span>').addClass('pull-right modified-date').html('Last Modified On : <a href="' + commits.data[0].html_url + '">' + commiter_data + '</a>');
510+
511+
var contributors_data = commits_data;
512+
var contributors = $('<div>').addClass('contributor-container');
513+
for (var i = 0; i < contributors_data.length; i++) {
514+
var contributor_d = contributors_data[i].committer;
515+
if (contributor_d && jQuery.inArray(contributor_d.login, contribut_array) == -1) {
516+
contribut_array.push(contributor_d.login);
517+
var contributor_img = $('<img>').addClass('contributor_img img-rounded').attr({
518+
'src': contributor_d.avatar_url,
519+
'alt': contributor_d.login
520+
});
521+
var contributor = $('<a>').addClass('contributor').attr({
522+
'href': contributor_d.html_url,
523+
'title': contributor_d.login,
524+
'target': '_blank'
525+
}).append(contributor_img);
526+
contributors.append(contributor);
527+
}
527528
}
528-
}
529-
var contributors_header = $('<div>').addClass('contributors_header').append('Contributors').append(last_date);
530-
$(extra_container).prepend(contributors).prepend(contributors_header);
529+
var contributors_header = $('<div>').addClass('contributors_header').append('Contributors').append(last_date);
530+
$(extra_container).prepend(contributors).prepend(contributors_header);
531531

532532

533-
}
533+
}
534534

535-
var div2 = $('<div>').addClass('clearFix');
536-
$('[role="flatdoc-content"]').prepend(div2).prepend(extra_container);
537-
}
535+
var div2 = $('<div>').addClass('clearFix');
536+
$('[role="flatdoc-content"]').prepend(div2).prepend(extra_container);
537+
}
538+
}.bind(this), 0);
538539
};
539540

540541
Route.mainCtrl = function($scope, $location, $timeout, $rootScope) {
@@ -742,7 +743,7 @@
742743

743744
var angApp = angular.module('docbaseApp', ['ngRoute'], function() {})
744745
.factory('FlatdocService', ['$q', '$route', '$location', '$anchorScroll', '$http', Route.fetch])
745-
.controller('URLCtrl', ['$scope', '$location', '$filter', 'data', 'commits', Route.URLCtrl])
746+
.controller('URLCtrl', ['$scope', '$location', '$filter', 'data', 'commits', '$timeout', Route.URLCtrl])
746747
.controller('MainCtrl', ['$scope', '$location', '$timeout', '$rootScope', Route.mainCtrl])
747748
.config(['$routeProvider', '$locationProvider', Route.config])
748749
.run(

0 commit comments

Comments
 (0)