Merge branch 'master' into master
This commit is contained in:
@@ -986,6 +986,7 @@
|
|||||||
if (!o.googleFonts) {
|
if (!o.googleFonts) {
|
||||||
o.googleFonts = [];
|
o.googleFonts = [];
|
||||||
}
|
}
|
||||||
|
|
||||||
this.options = o;
|
this.options = o;
|
||||||
this.$original = $(original);
|
this.$original = $(original);
|
||||||
this.setupHtml();
|
this.setupHtml();
|
||||||
@@ -1050,6 +1051,7 @@
|
|||||||
$("li.active", this.$results).trigger("click");
|
$("li.active", this.$results).trigger("click");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.query += String.fromCharCode(e.keyCode).toLowerCase();
|
this.query += String.fromCharCode(e.keyCode).toLowerCase();
|
||||||
var $found = $(
|
var $found = $(
|
||||||
"li[data-query^='" + this.query + "']"
|
"li[data-query^='" + this.query + "']"
|
||||||
@@ -1061,18 +1063,15 @@
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
keyUp: function (e) {
|
keyUp: function (e) {
|
||||||
this.keyActive = false;
|
this.keyActive = false;
|
||||||
},
|
},
|
||||||
|
|
||||||
bindEvents: function () {
|
bindEvents: function () {
|
||||||
var self = this;
|
var self = this;
|
||||||
|
|
||||||
$("li", this.$results)
|
$("li", this.$results)
|
||||||
.click(__bind(this.selectFont, this))
|
.click(__bind(this.selectFont, this))
|
||||||
.mouseover(__bind(this.activateFont, this));
|
.mouseover(__bind(this.activateFont, this));
|
||||||
|
|
||||||
this.$select.click(
|
this.$select.click(
|
||||||
__bind(function () {
|
__bind(function () {
|
||||||
self.toggleDropdown("show");
|
self.toggleDropdown("show");
|
||||||
|
|||||||
Reference in New Issue
Block a user