Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: Evangenieur/hvid.io
base: 14a0215ce7
...
head fork: Evangenieur/hvid.io
compare: 38e57aa344
  • 3 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 8 additions and 4 deletions.
  1. +1 −1  package.json
  2. +7 −3 public/javascripts/hvidio.js
View
2  package.json
@@ -1,6 +1,6 @@
{
"name": "hvid.io",
- "version": "0.0.0-15",
+ "version": "0.0.0-16",
"description": "RealTime Video Search Twitter / Facebook / GooglePlus",
"main": "server.coffee",
"scripts": {
View
10 public/javascripts/hvidio.js
@@ -177,6 +177,7 @@
hvidio.loading(true);
hvidio.fetch(keyword, function(data) {
+ console.log("PASSE PAR LA CALLBACK");
$main.addClass('large');
hvidio.templatize('#videosTemplate', { videos: data }, '#results');
@@ -219,6 +220,7 @@
vScrollbar: true,
snap: 'li',
useTransition: true,
+ bounce: false,
onRefresh: function() {
toggleButtons(this);
},
@@ -260,8 +262,10 @@
this.embed = this.embed.substr(0, pos);
}
- if (callback) {
- callback([this]); callback = null;
+ if (typeof search.initiated == "undefined") {
+ search.initiated = true;
+ scroll = false;
+ callback([this]);
$list = $("#video-list")
} else {
var html = hvidio.templatize('#videoTemplate', { video: this });
@@ -293,7 +297,7 @@
},
convertId: function(id) {
- return id.replace('/', '-', id);
+ return id.replace('/', '-');
},
templatize: function(template, data, output) {

No commit comments for this range

Something went wrong with that request. Please try again.