Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
update jquery
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
- Loading branch information
|
@@ -69,15 +69,15 @@ lang="{{ lang }}"> |
|
|
{% macro late_load_js() %} |
|
|
{% if use_bundles %} |
|
|
{% if use_cdn %} |
|
|
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> |
|
|
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script> |
|
|
<script src="//maxcdn.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script> |
|
|
<script src="/assets/js/all.js"></script> |
|
|
{% else %} |
|
|
<script src="/assets/js/all-nocdn.js"></script> |
|
|
{% endif %} |
|
|
{% else %} |
|
|
{% if use_cdn %} |
|
|
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> |
|
|
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script> |
|
|
<script src="//maxcdn.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script> |
|
|
{% else %} |
|
|
<script src="/assets/js/jquery.min.js"></script> |
|
|
|
@@ -69,15 +69,15 @@ lang="${lang}"> |
|
|
<%def name="late_load_js()"> |
|
|
%if use_bundles: |
|
|
%if use_cdn: |
|
|
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> |
|
|
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script> |
|
|
<script src="//maxcdn.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script> |
|
|
<script src="/assets/js/all.js"></script> |
|
|
%else: |
|
|
<script src="/assets/js/all-nocdn.js"></script> |
|
|
%endif |
|
|
%else: |
|
|
%if use_cdn: |
|
|
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> |
|
|
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script> |
|
|
<script src="//maxcdn.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script> |
|
|
%else: |
|
|
<script src="/assets/js/jquery.min.js"></script> |
|
|
|
@@ -68,15 +68,15 @@ lang="{{ lang }}"> |
|
|
{% macro late_load_js() %} |
|
|
{% if use_bundles %} |
|
|
{% if use_cdn %} |
|
|
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script> |
|
|
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script> |
|
|
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script> |
|
|
<script src="/assets/js/all.js"></script> |
|
|
{% else %} |
|
|
<script src="/assets/js/all-nocdn.js"></script> |
|
|
{% endif %} |
|
|
{% else %} |
|
|
{% if use_cdn %} |
|
|
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script> |
|
|
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script> |
|
|
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script> |
|
|
{% else %} |
|
|
<script src="/assets/js/jquery.min.js"></script> |
|
|
|
@@ -68,15 +68,15 @@ lang="${lang}"> |
|
|
<%def name="late_load_js()"> |
|
|
%if use_bundles: |
|
|
%if use_cdn: |
|
|
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script> |
|
|
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script> |
|
|
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script> |
|
|
<script src="/assets/js/all.js"></script> |
|
|
%else: |
|
|
<script src="/assets/js/all-nocdn.js"></script> |
|
|
%endif |
|
|
%else: |
|
|
%if use_cdn: |
|
|
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script> |
|
|
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script> |
|
|
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script> |
|
|
%else: |
|
|
<script src="/assets/js/jquery.min.js"></script> |
|
|
|
@@ -78,10 +78,10 @@ def jinjify(in_theme, out_theme): |
|
|
parent = mappings[child] |
|
|
|
|
|
with io.open(os.path.join(out_theme, "parent"), "w+", encoding='utf-8') as outf: |
|
|
outf.write(parent + '\n') |
|
|
outf.write(unicode(parent) + u'\n') |
|
|
|
|
|
with io.open(os.path.join(out_theme, "engine"), "w+", encoding='utf-8') as outf: |
|
|
outf.write("jinja\n") |
|
|
outf.write(u"jinja\n") |
|
|
|
|
|
# Copy assets |
|
|
# shutil.rmtree(os.path.join(out_theme, "assets")) |
|
|
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session.
You signed out in another tab or window. Reload to refresh your session.