Skip to content

Commit a418d23

Browse files
committed
[+]: added "Modernizr" + "Polyfills"
1 parent 0a28f8e commit a418d23

File tree

211 files changed

+48097
-4959
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

211 files changed

+48097
-4959
lines changed

Diff for: app/storage/db/test.s3db

0 Bytes
Binary file not shown.

Diff for: app/views/tpl_base.twig

+53-11
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,55 @@
2828

2929
{# JavaScript #}
3030
{% block head_js %}
31-
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
31+
32+
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
3233
<script>window.jQuery || document.write('<script src="vendor/bower/jquery/dist/jquery.min.js"><\/script>')</script>
3334

34-
<script src="/js-min/plugins.js"></script>
35-
<script src="/js-min/app.js"></script>
35+
<script>
36+
// Avoid `console` errors in browsers that lack a console.
37+
(function() {
38+
var method;
39+
var noop = function () {};
40+
var methods = [
41+
'assert', 'clear', 'count', 'debug', 'dir', 'dirxml', 'error',
42+
'exception', 'group', 'groupCollapsed', 'groupEnd', 'info', 'log',
43+
'markTimeline', 'profile', 'profileEnd', 'table', 'time', 'timeEnd',
44+
'timeStamp', 'trace', 'warn'
45+
];
46+
var length = methods.length;
47+
var console = (window.console = window.console || {});
48+
49+
while (length--) {
50+
method = methods[length];
51+
52+
// Only stub undefined methods.
53+
if (!console[method]) {
54+
console[method] = noop;
55+
}
56+
}
57+
}());
58+
</script>
59+
60+
<script src="/vendor/modernizr.custom.js"></script>
3661

37-
<!-- only for example-images -->
38-
<script src="/vendor/bower/bootstrap-sass/docs-assets/js/holder.js"></script>
62+
<!--[if lt IE 9]>
63+
<script src="/vendor/bower/nwmatcher/src/nwmatcher.js"></script>
64+
<script src="/vendor/bower/selectivizr/selectivizr.js"></script>
65+
<![endif]-->
66+
67+
<script>
68+
Modernizr.load(
69+
{
70+
test : Modernizr.mq('only all'),
71+
nope : '/vendor/bower/respond/dest/respond.min.js'
72+
}
73+
,
74+
{
75+
test: Modernizr.cssremunit,
76+
nope : '/vendor/bower/rem-unit-polyfill/js/rem.min.js'
77+
}
78+
);
79+
</script>
3980

4081
<!-- load web-fonts -->
4182
<script src="//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js"></script>
@@ -51,10 +92,6 @@
5192

5293
{% flush %}
5394

54-
{{ plugin['in_header'] | raw }}
55-
56-
{% flush %}
57-
5895
<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon">
5996
{% endblock %}
6097
</head>
@@ -131,9 +168,14 @@
131168
<li><a href="./index.html" title="Scroll to top"><i class="glyphicon glyphicon-chevron-up"></i></a></li>
132169
</ul>
133170

134-
{{ plugin['in_footer'] | raw }}
171+
{# JavaScript #}
172+
{% block footer_js %}
173+
<script src="/js-min/plugins.js"></script>
174+
<script src="/js-min/app.js"></script>
135175

136-
{{ logger | raw }}
176+
<!-- only for example-images -->
177+
<script src="/vendor/bower/bootstrap-sass/docs-assets/js/holder.js"></script>
178+
{% endblock %}
137179

138180
</body>
139181
</html>

Diff for: web/.bowerrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"directory" : "vendor/bower/"
3+
}

Diff for: web/Gruntfile.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ module.exports = function(grunt) {
8484
sourceMap: true
8585
},
8686
src: [
87-
'vendor/bower/bootstrap-sass/dist/js/bootstrap.min.js'
87+
'vendor/bower/bootstrap-sass/dist/js/bootstrap.min.js',
88+
'vendor/modernizr.custom..js'
8889
],
8990
dest: 'js/plugins.js'
9091
}

Diff for: web/bower.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
"normalize-scss": "3.*",
77
"font-awesome": "4.0.*",
88
"bootstrap-sass": "3.*",
9-
"jquery": "2.*"
9+
"jquery": "1.*",
10+
"nwmatcher": "~1.3.3",
11+
"selectivizr": "~1.0.2",
12+
"respond": "~1.4.2",
13+
"rem-unit-polyfill": "~1.3.2"
1014
}
1115
}

Diff for: web/css-min/app.css

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: web/css-min/app.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: web/css/app.css

+11-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: web/css/app.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: web/js-min/app.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: web/js-min/bootstrap.js

-6
This file was deleted.

Diff for: web/js-min/bootstrap.js.map

-1
This file was deleted.

Diff for: web/js-min/bootstrap.min.js

-6
This file was deleted.

Diff for: web/js-min/bootstrap.min.js.map

-1
This file was deleted.

Diff for: web/js-min/plugins.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)