skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Merge branch 'master' of github.com:Lyndir/MasterPassword

Browse Source
This commit is contained in:
Maarten Billemont 2018-02-18 23:47:35 -05:00
commit d31c5eed0a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform-independent/web-js/index.html
View File

@ -61,10 +61,9 @@
</footer> </footer>
<!-- Scripts --> <!-- Scripts -->
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script> <script>document.write('<script src="js/vendor/jquery-2.1.1.min.js"><\/script>')</script>
<script>window.jQuery || document.write('<script src="js/vendor/jquery-2.1.1.js"><\/script>')</script> <script>window.jQuery || document.write('<script src="js/vendor/jquery-2.1.1.js"><\/script>')</script>
<script>window.jQuery || document.write('<script src="js/vendor/jquery-2.1.1.min.js"><\/script>')</script> <script src="js/dependencies.js?4"></script>
<script src="js/dependencies.js?3"></script>
<script src="js/main.js?3"></script> <script src="js/main.js?3"></script>
</body> </body>

3
platform-independent/web-js/js/dependencies.js
View File

@ -16,11 +16,12 @@ if ((!window.crypto || !window.crypto.subtle) && window.SubtleCrypto)
// If Web Crypto API is not supported we include a JS crypto library // If Web Crypto API is not supported we include a JS crypto library
// https://code.google.com/p/crypto-js/ // https://code.google.com/p/crypto-js/
/* Disabled by default. Enable manually if your browser requires this.
if (!window.crypto || !window.crypto.subtle) { if (!window.crypto || !window.crypto.subtle) {
document.write("<script src=https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/rollups/hmac-sha256.js><\/script>"); document.write("<script src=https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/rollups/hmac-sha256.js><\/script>");
document.write("<script src=https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/rollups/pbkdf2.js><\/script>"); document.write("<script src=https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/rollups/pbkdf2.js><\/script>");
document.write("<script src=https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/components/lib-typedarrays-min.js><\/script>"); document.write("<script src=https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/components/lib-typedarrays-min.js><\/script>");
} }/**/
if (!Number.MAX_SAFE_INTEGER) if (!Number.MAX_SAFE_INTEGER)
Number.MAX_SAFE_INTEGER = Math.pow(2, 53) - 1; Number.MAX_SAFE_INTEGER = Math.pow(2, 53) - 1;