Skip to content

Commit 777a651

Browse files
committed
"BAH-3841| Fix slow clinical module load by adding dependencies locally"
1 parent 37856de commit 777a651

File tree

4 files changed

+1756
-30
lines changed

4 files changed

+1756
-30
lines changed

ui/Gruntfile.js

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,52 @@ module.exports = function (grunt) {
349349
src: [
350350
'*.*'
351351
]
352+
},
353+
{
354+
expand: true,
355+
dot: true,
356+
cwd: '<%= yeoman.nodeModules %>/html2canvas/dist/',
357+
dest: '<%= yeoman.app %>/components/html2canvas/',
358+
src: [
359+
'html2canvas.min.js'
360+
]
361+
},
362+
{
363+
expand: true,
364+
dot: true,
365+
cwd: '<%= yeoman.nodeModules %>/html2pdf.js/dist/',
366+
dest: '<%= yeoman.app %>/components/html2pdf.js/',
367+
src: [
368+
'html2pdf.bundle.min.js'
369+
]
370+
},
371+
{
372+
expand: true,
373+
dot: true,
374+
cwd: '<%= yeoman.nodeModules %>/pdfmake/build/',
375+
dest: '<%= yeoman.app %>/components/pdfmake/',
376+
src: [
377+
'pdfmake.min.js',
378+
'vfs_fonts.js'
379+
]
380+
},
381+
{
382+
expand: true,
383+
dot: true,
384+
cwd: '<%= yeoman.nodeModules %>/marked/',
385+
dest: '<%= yeoman.app %>/components/marked/',
386+
src: [
387+
'marked.min.js'
388+
]
389+
},
390+
{
391+
expand: true,
392+
dot: true,
393+
cwd: '<%= yeoman.nodeModules %>/lib-jitsi-meet-dist/dist/',
394+
dest: '<%= yeoman.app %>/components/lib-jitsi-meet/',
395+
src: [
396+
'external_api.min.js'
397+
]
352398
}
353399
]
354400
}

ui/app/clinical/index.html

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ <h3 class="close" ng-click="closeTeleConsultation()">
4444
</div>
4545
<link rel="stylesheet" href="../components/offline/themes/{{getLocaleCSS()}}.css">
4646

47-
<script src='https://meet.jit.si/external_api.js'></script>
48-
4947
<script src="../components/jquery/jquery.min.js"></script>
5048
<script src="../lib/jquery/jquery-ui-1.10.4.custom.min.js"></script>
5149
<script src="../lib/modernizr.custom.80690.js"></script>
@@ -572,12 +570,15 @@ <h3 class="close" ng-click="closeTeleConsultation()">
572570
<script src="/bahmni_config/openmrs/apps/clinical/common/diagnosisServiceConfig.js"></script>
573571

574572
<!-- HTML to PDF -->
575-
<script src="https://cdnjs.cloudflare.com/ajax/libs/html2pdf.js/0.10.1/html2pdf.bundle.min.js"></script>
576-
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.41/pdfmake.min.js"></script>
577-
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
578-
<script src="https://cdnjs.cloudflare.com/ajax/libs/html2canvas/0.4.1/html2canvas.min.js"></script>
579-
573+
<script src="../components/html2pdf.js/html2pdf.bundle.min.js"></script>
574+
<script src="../components/pdfmake/pdfmake.min.js"></script>
575+
<script src="../components/pdfmake/vfs_fonts.js"></script>
576+
<script src="../components/html2canvas/html2canvas.min.js"></script>
577+
578+
<!-- Jitsi -->
579+
<script src="../components/lib-jitsi-meet/external_api.min.js"></script>
580+
580581
<!-- Marked -->
581-
<script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
582+
<script src="../components/marked/marked.min.js"></script>
582583
</body>
583584
</html>

ui/package.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,12 @@
5050
"@bower_components/purl": "allmarkedup/purl#2.3.1",
5151
"@bower_components/select2": "ivaynberg/select2#~3.4",
5252
"@bower_components/stacktrace-js": "stacktracejs/stacktrace.js#0.6.4",
53-
"@bower_components/zeroclipboard": "zeroclipboard/zeroclipboard#~2.1.0"
53+
"@bower_components/zeroclipboard": "zeroclipboard/zeroclipboard#~2.1.0",
54+
"html2canvas": "1.4.1",
55+
"html2pdf.js": "0.10.1",
56+
"lib-jitsi-meet-dist": "^2.1.5",
57+
"marked": "2.1.3",
58+
"pdfmake": "0.1.41"
5459
},
5560
"devDependencies": {
5661
"@bower_components/Cortana": "Yago31/Cortana#~1.2.6",

0 commit comments

Comments
 (0)