mirror of
https://github.com/bobwen-dev/react-templates
synced 2025-04-12 00:56:39 +02:00
fix "Blocked loading mixed active content" issue in Firefox
https://github.com/wix/react-templates/pull/3
This commit is contained in:
parent
465cfa93cd
commit
8ec25ad8cd
@ -89,7 +89,7 @@ module.exports = function (grunt) {
|
||||
options: readConfig('./home.config.js')
|
||||
},
|
||||
playground: {
|
||||
options: readConfig('./home.config.js')
|
||||
options: readConfig('./playground.config.js')
|
||||
}
|
||||
}
|
||||
});
|
||||
|
@ -9,12 +9,12 @@
|
||||
|
||||
<link rel="shortcut icon" href="https://facebook.github.io/react/favicon.ico">
|
||||
|
||||
<link href='http://fonts.googleapis.com/css?family=Lato:100,300,400,700' rel='stylesheet' type='text/css'>
|
||||
<link href='//fonts.googleapis.com/css?family=Lato:100,300,400,700' rel='stylesheet' type='text/css'>
|
||||
|
||||
<!-- Latest compiled and minified CSS -->
|
||||
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css">
|
||||
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css">
|
||||
<!-- Optional theme -->
|
||||
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap-theme.min.css">
|
||||
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap-theme.min.css">
|
||||
<!-- Latest compiled and minified JavaScript -->
|
||||
|
||||
<link rel="stylesheet" href="playground/libs/codemirror-4.8/lib/codemirror.css" />
|
||||
@ -27,7 +27,7 @@
|
||||
<body>
|
||||
<div id="container">
|
||||
</div>
|
||||
<script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
|
||||
<script src="//code.jquery.com/jquery-1.11.0.min.js"></script>
|
||||
<!--<script src="playground/libs/ace-builds-1.1.8/src-min-noconflict/ace.js" type="text/javascript" charset="utf-8"></script>-->
|
||||
<!--<script src="https://cdn.firebase.com/js/client/2.0.5/firebase.js"></script>-->
|
||||
<!--<script src="http://cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.js"></script>-->
|
||||
|
@ -11,7 +11,7 @@
|
||||
<link href='//fonts.googleapis.com/css?family=Lato:100,300,700' rel='stylesheet' type='text/css'>
|
||||
|
||||
<!-- Latest compiled and minified CSS -->
|
||||
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css">
|
||||
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css">
|
||||
<!-- Optional theme -->
|
||||
<!--<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap-theme.min.css">-->
|
||||
|
||||
|
2
playground/dist/fiddle.min.js
vendored
2
playground/dist/fiddle.min.js
vendored
File diff suppressed because one or more lines are too long
2
playground/dist/home.min.js
vendored
2
playground/dist/home.min.js
vendored
File diff suppressed because one or more lines are too long
@ -1,10 +1,10 @@
|
||||
requirejs.config({
|
||||
// baseUrl: '/',
|
||||
paths: {
|
||||
lodash: 'http://cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min',
|
||||
jquery: 'http://code.jquery.com/jquery-1.11.0.min',
|
||||
lodash: '//cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min',
|
||||
jquery: '//code.jquery.com/jquery-1.11.0.min',
|
||||
firebase: 'https://cdn.firebase.com/js/client/2.0.5/firebase',
|
||||
react: 'http://fb.me/react-with-addons-0.12.2',
|
||||
react: '//fb.me/react-with-addons-0.12.2',
|
||||
//ace: '../ace-builds-1.1.8/src-min/ace',
|
||||
fiddle: './fiddle',
|
||||
text: 'libs/requirejs-plugins/text',
|
||||
@ -13,7 +13,7 @@ requirejs.config({
|
||||
//codeMirror: 'libs/codemirror-4.8/lib/codemirror',
|
||||
//htmlmixed: 'libs/codemirror-4.8/mode/htmlmixed/htmlmixed',
|
||||
//javascript: 'libs/codemirror-4.8/mode/javascript/javascript'
|
||||
//'react/addons': 'http://fb.me/react-with-addons-0.12.1'
|
||||
//'react/addons': '//fb.me/react-with-addons-0.12.1'
|
||||
},
|
||||
shim: {
|
||||
lodash: {exports: '_'},
|
||||
|
@ -1,14 +1,14 @@
|
||||
requirejs.config({
|
||||
// baseUrl: '/',
|
||||
paths: {
|
||||
lodash: 'http://cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min',
|
||||
jquery: 'http://code.jquery.com/jquery-1.11.0.min',
|
||||
lodash: '//cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min',
|
||||
jquery: '//code.jquery.com/jquery-1.11.0.min',
|
||||
firebase: 'https://cdn.firebase.com/js/client/2.0.5/firebase',
|
||||
react: 'http://fb.me/react-with-addons-0.12.2',
|
||||
react: '//fb.me/react-with-addons-0.12.2',
|
||||
text: 'libs/requirejs-plugins/text',
|
||||
json: 'libs/requirejs-plugins/json'
|
||||
//ace: '../ace-builds-1.1.8/src-min/ace',
|
||||
//'react/addons': 'http://fb.me/react-with-addons-0.12.1'
|
||||
//'react/addons': '//fb.me/react-with-addons-0.12.1'
|
||||
},
|
||||
shim: {
|
||||
lodash: { exports: '_' },
|
||||
|
Loading…
x
Reference in New Issue
Block a user