Robot/morris.js
1
0
Fork 0
mirror of https://github.com/morrisjs/morris.js.git synced 2024-11-13 07:11:12 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/mikach/morris.js

Browse source 
Conflicts:
	morris.min.js
This commit is contained in:
Olly Smith 2014-06-14 08:01:24 +01:00
commit 4346d98fdd
3 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/morris.hover.coffee
View file

@ -11,9 +11,12 @@ class Morris.Hover
@options.parent.append(@el) @options.parent.append(@el)
update: (html, x, y) -> update: (html, x, y) ->
@html(html) if not html
@show() @hide()
@moveTo(x, y) else
@html(html)
@show()
@moveTo(x, y)
html: (content) -> html: (content) ->
@el.html(content) @el.html(content)

10
morris.js
View file

@ -663,9 +663,13 @@ Licensed under the BSD-2-Clause License.
} }
Hover.prototype.update = function(html, x, y) { Hover.prototype.update = function(html, x, y) {
this.html(html); if (!html) {
this.show(); return this.hide();
return this.moveTo(x, y); } else {
this.html(html);
this.show();
return this.moveTo(x, y);
}
}; };
Hover.prototype.html = function(content) { Hover.prototype.html = function(content) {

4
morris.min.js vendored
View file

File diff suppressed because one or more lines are too long