Skip to content

Commit

Permalink
Merge pull request #3826 from IgniteUI/sass-dropdown-optimization-7.0.x
Browse files Browse the repository at this point in the history
fix(api-dropdown): sass dropdown optimization and version reverse
  • Loading branch information
zdrawku authored Feb 5, 2019
2 parents 9951cee + b5ad387 commit 4cb6c5e
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
withCredentials: false
}
}).done((data) => {
const folders = data.folders;
let folders = data.folders;
const select = $('#versions');
const lastVersion = folders.slice(-1)[0];

folders = folders.reverse();
folders.forEach(f => {
select.append($('<option>', {
value: `${baseUrl}/angular-docs/${f}/sass`,
Expand Down
12 changes: 9 additions & 3 deletions extras/docs/themes/sassdoc/views/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@
<link rel="stylesheet" href="https://use.typekit.net/zhy2hpz.css">
<link rel="stylesheet" href="assets/css/main.css" />

{{!-- <script src="../assets/js/versioning/tag-versions.req.js"></script> --}}

<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script>
<script src="https://code.jquery.com/jquery-2.1.4.min.js" integrity="sha256-8WqyJLuWKRBVhxXIL1jBDD7SDxU936oZkCnxQbWwJVw=" crossorigin="anonymous"></script>
<script type="text/javascript" src="https://infragistics.com/assets/modern/scripts/jquery-migrate.min.js"></script>


<!-- Google Tag Manager -->
<script>
(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
Expand All @@ -39,6 +46,7 @@

{{> header}}

<script src="assets/js/versioning/tag-versions.req.js"></script>
{{!
! You can access any variable you set in your configuration file from the `view` object.
! Basically your configuration file is passed to the view as the `view` object.
Expand Down Expand Up @@ -169,9 +177,7 @@
<script src="assets/js/vendor/highlight.pack.js"></script>
<script src="https://unpkg.com/lunr/lunr.js"></script>
<script>window.sassdocIndex = {{{json idx}}}</script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script>
<script src="https://code.jquery.com/jquery-2.1.4.min.js" integrity="sha256-8WqyJLuWKRBVhxXIL1jBDD7SDxU936oZkCnxQbWwJVw=" crossorigin="anonymous"></script>
<script type="text/javascript" src="https://infragistics.com/assets/modern/scripts/jquery-migrate.min.js"></script>

<script type="text/javascript" src="https://infragistics.com/assets/modern/scripts/plugins.nav.js"></script>
<script type="text/javascript" src="https://infragistics.com/assets/modern/scripts/navigation.js"></script>
<script src="assets/js/main.js"></script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
withCredentials: false
}
}).done((data) => {
const folders = data.folders;
let folders = data.folders;
const select = $('#versions')
const lastVersion = folders.slice(-1)[0];

folders = folders.reverse();
folders.forEach(f => {
select.append($('<option>', {
value: `${baseUrl}/angular-docs/${f}/typescript`,
Expand Down
3 changes: 2 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ const SASSDOC_THEME = {

gulp.task('sassdoc-clear-main', () => {
del.sync(`${SASSDOC_THEME.JS_DIR}/main.js`)
del.sync(`${SASSDOC_THEME.JS_DIR}/main.d.ts`)
})

gulp.task('sassdoc-ts',
Expand All @@ -263,7 +264,7 @@ gulp.task('sassdoc-ts',

gulp.task('sassdoc-js', ['sassdoc-ts'], () => {
gulp.src([
`${SASSDOC_THEME.JS_DIR}/**/*.js`,
`${SASSDOC_THEME.JS_DIR}/**/!(tag-versions.req)*.js`,
])
.pipe(concat('main.js'))
.pipe(gulp.dest(SASSDOC_THEME.JS_DIR));
Expand Down

0 comments on commit 4cb6c5e

Please sign in to comment.