aboutsummaryrefslogtreecommitdiff
path: root/src/js/fiveui
diff options
context:
space:
mode:
Diffstat (limited to 'src/js/fiveui')
-rw-r--r--src/js/fiveui/build.mk13
-rw-r--r--src/js/fiveui/injected/ui.js10
2 files changed, 7 insertions, 16 deletions
diff --git a/src/js/fiveui/build.mk b/src/js/fiveui/build.mk
index 41d2c06..3679a95 100644
--- a/src/js/fiveui/build.mk
+++ b/src/js/fiveui/build.mk
@@ -78,21 +78,10 @@ $1/data/font-awesome/css/%: $(lib-dir)/font-awesome/css/% \
| $1/data/font-awesome/css
$$(call cmd,cp)
-$1/data/font-awesome/font: | $1/data/font-awesome
- $$(call cmd,mkdir)
-
-$1/data/font-awesome/font/%: $(lib-dir)/font-awesome/font/% \
- | $1/data/font-awesome/font
- $$(call cmd,cp)
-
$1/data/font-awesome: | $1/data
$$(call cmd,mkdir)
-$2: $1/data/font-awesome/css/font-awesome.css \
- $1/data/font-awesome/font/fontawesome-webfont.eot \
- $1/data/font-awesome/font/fontawesome-webfont.svg \
- $1/data/font-awesome/font/fontawesome-webfont.woff \
- $1/data/font-awesome/font/fontawesome-webfont.ttf
+$2: $1/data/font-awesome/css/font-awesome.css
# simple libraries
diff --git a/src/js/fiveui/injected/ui.js b/src/js/fiveui/injected/ui.js
index 8bedc46..e02d83d 100644
--- a/src/js/fiveui/injected/ui.js
+++ b/src/js/fiveui/injected/ui.js
@@ -181,8 +181,6 @@
if(height != this.height) {
- console.log('changing height');
-
this.height = height;
var ppos = this.$problems.position();
@@ -363,6 +361,8 @@
this.$el.one('click', _.bind(this.open, this));
this.$body.slideUp(100);
+
+ core.maskProblem(this.problem);
},
open:function() {
@@ -371,6 +371,8 @@
this.$el.one('click', _.bind(this.close, this));
this.$body.slideDown(100);
+
+ core.highlightProblem(this.problem);
},
});
@@ -420,7 +422,7 @@
} else {
// add the rule to the list of highlighted elements, and change its style
// to look obvious.
- var elt = core.query('.' + prob.hash);
+ var elt = fiveui.query('.' + prob.hash);
var oldStyle = elt.attr('style');
core.maskRules(function() {
@@ -443,7 +445,7 @@
obj.highlighted = obj.highlighted - 1;
if(obj.highlighted == 0) {
- var elt = core.query('.' + prob.hash);
+ var elt = fiveui.query('.' + prob.hash);
// remove the fiveui style
core.maskRules(function() {