archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

User our own jQuery

Browse Source
This commit is contained in:
Pablo Vazquez
2016-08-30 14:09:56 +02:00
parent b9b993fe4a
commit 8d6df947c8
7 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pillar/web/static/assets/js/vendor/jquery-3.1.0.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
src/scripts/tutti/1_project-navigation.js
View File

@@ -130,7 +130,7 @@ function hopToTop(limit){
document.getElementById("hop").onclick = function(e){ window.scrollTo(0, 0);} document.getElementById("hop").onclick = function(e){ window.scrollTo(0, 0);}
$(window).scroll(function() { $(window).on("scroll", function () {
if ($(window).scrollTop() >= limit) {$("#hop").addClass("active")} else {$("#hop").removeAttr("class")} if ($(window).scrollTop() >= limit) {$("#hop").addClass("active")} else {$("#hop").removeAttr("class")}
}); });
} }

4
src/templates/layout.jade
View File

@@ -24,7 +24,7 @@ html(lang="en")
meta(name="twitter:image", content="{{ url_for('static', filename='assets/img/backgrounds/background_gleb_locomotive.jpg')}}") meta(name="twitter:image", content="{{ url_for('static', filename='assets/img/backgrounds/background_gleb_locomotive.jpg')}}")
| {% endblock %} | {% endblock %}
script(src="//code.jquery.com/jquery-2.2.1.min.js") script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery-3.1.0.min.js')}}")
script(src="//cdn.jsdelivr.net/typeahead.js/0.11.1/typeahead.jquery.min.js") script(src="//cdn.jsdelivr.net/typeahead.js/0.11.1/typeahead.jquery.min.js")
script(src="//cdn.jsdelivr.net/algoliasearch/3/algoliasearch.min.js") script(src="//cdn.jsdelivr.net/algoliasearch/3/algoliasearch.min.js")
script(src="//cdnjs.cloudflare.com/ajax/libs/js-cookie/2.0.3/js.cookie.min.js",) script(src="//cdnjs.cloudflare.com/ajax/libs/js-cookie/2.0.3/js.cookie.min.js",)
@@ -407,7 +407,7 @@ html(lang="en")
link(href='//fonts.googleapis.com/css?family=Roboto:300,400,500', rel='stylesheet', type='text/css') link(href='//fonts.googleapis.com/css?family=Roboto:300,400,500', rel='stylesheet', type='text/css')
link(href='//fonts.googleapis.com/css?family=Lato:300,400', rel='stylesheet', type='text/css') link(href='//fonts.googleapis.com/css?family=Lato:300,400', rel='stylesheet', type='text/css')
script(type="text/javascript", src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js") script(type="text/javascript", src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js")
script(type="text/javascript", src="//cdnjs.cloudflare.com/ajax/libs/jquery.perfect-scrollbar/0.6.10/js/min/perfect-scrollbar.min.js") script(type="text/javascript", src="//cdnjs.cloudflare.com/ajax/libs/jquery.perfect-scrollbar/0.6.10/js/min/perfect-scrollbar.min.js")
script(type="text/javascript", src="//cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.5/handlebars.min.js") script(type="text/javascript", src="//cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.5/handlebars.min.js")

2
src/templates/nodes/custom/group_hdri/view_embed.jade
View File

@@ -104,7 +104,7 @@ script.
if (preview_img) { if (preview_img) {
preview_img.load(function() { preview_img.on('load', function() {
var preview = thumbnail.find('.list-node-children-item-preview'); var preview = thumbnail.find('.list-node-children-item-preview');

2
src/templates/nodes/custom/group_texture/view_embed.jade
View File

@@ -135,7 +135,7 @@ script.
if (preview_img) { if (preview_img) {
preview_img.load(function() { preview_img.on('load', function() {
var preview = thumbnail.find('.list-node-children-item-preview'); var preview = thumbnail.find('.list-node-children-item-preview');

2
src/templates/nodes/custom/texture/view_embed.jade
View File

@@ -135,7 +135,7 @@ script.
/* Make dummy img in memory otherwise we have css issues */ /* Make dummy img in memory otherwise we have css issues */
$("<img/>") $("<img/>")
.attr('src', src_xl) .attr('src', src_xl)
.load(function(){ .on('load', function(){
src_xl_width = this.width; src_xl_width = this.width;
src_xl_height = this.height; src_xl_height = this.height;
}); });

2
src/templates/projects/view_embed.jade
View File

@@ -154,7 +154,7 @@ script.
$imgs.each(function(i) { $imgs.each(function(i) {
var $img = $(this); var $img = $(this);
$('<img/>').load(function() { $('<img/>').on('load', function() {
++cnt; ++cnt;
if( cnt === totalImgs ) { if( cnt === totalImgs ) {
$imgs.show(); $imgs.show();