You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2013/11/04 23:14:01 UTC
git commit: Remove a bug that prevented console output from appearing
Change the text filter to require all words entered into filter field to be
present in text
Updated Branches:
refs/heads/master 575162981 -> 77e2b157c
Remove a bug that prevented console output from appearing
Change the text filter to require all words entered into filter field to be present in text
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/77e2b157
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/77e2b157
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/77e2b157
Branch: refs/heads/master
Commit: 77e2b157c3c687fb7d5685b3108a7c9b61923a66
Parents: 5751629
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Mon Nov 4 14:13:53 2013 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Mon Nov 4 14:13:53 2013 -0800
----------------------------------------------------------------------
.../META-INF/modules/t5/core/console.coffee | 70 +++++++++++---------
1 file changed, 38 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/77e2b157/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/console.coffee
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/console.coffee b/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/console.coffee
index 3962f8a..2b52f0b 100644
--- a/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/console.coffee
+++ b/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/console.coffee
@@ -31,9 +31,15 @@ define ["./dom", "underscore", "./bootstrap"],
filter = noFilter
return
- text = text.toLowerCase()
+ words = text.toLowerCase().split /\s+/
- filter = (e) -> e.text().toLowerCase().indexOf(text) >= 0
+ filter = (e) ->
+ content = e.text().toLowerCase()
+
+ for word in words
+ return false if content.indexOf(word) < 0
+
+ return true
return
@@ -84,55 +90,55 @@ define ["./dom", "underscore", "./bootstrap"],
if consoleAttribute is "invisible"
floatingConsole.hide()
- messages = floatingConsole.findFirst ".message-container"
+ messages = floatingConsole.findFirst ".message-container"
- floatingConsole.findFirst("[data-action=enable]").attribute "disabled", true
+ floatingConsole.findFirst("[data-action=enable]").attribute "disabled", true
- floatingConsole.on "click", "[data-action=clear]", ->
- floatingConsole.hide()
- messages.update ""
+ floatingConsole.on "click", "[data-action=clear]", ->
+ floatingConsole.hide()
+ messages.update ""
- floatingConsole.on "click", "[data-action=disable]", ->
+ floatingConsole.on "click", "[data-action=disable]", ->
- @attribute "disabled", true
- floatingConsole.findFirst("[data-action=enable]").attribute "disabled", false
+ @attribute "disabled", true
+ floatingConsole.findFirst("[data-action=enable]").attribute "disabled", false
- messages.hide()
+ messages.hide()
- return false
+ return false
- floatingConsole.on "click", "[data-action=enable]", ->
+ floatingConsole.on "click", "[data-action=enable]", ->
- @attribute "disabled", true
- floatingConsole.findFirst("[data-action=disable]").attribute "disabled", false
+ @attribute "disabled", true
+ floatingConsole.findFirst("[data-action=disable]").attribute "disabled", false
- messages.show()
+ messages.show()
- return false
+ return false
- floatingConsole.on "change keyup", "input", ->
- updateFilter @value()
+ floatingConsole.on "change keyup", "input", ->
+ updateFilter @value()
- for e in messages.children()
- visible = filter e
+ for e in messages.children()
+ visible = filter e
- e[if visible then "show" else "hide"]()
+ e[if visible then "show" else "hide"]()
- return false
+ return false
- div = dom.create
- class: className,
- _.escape message
+ div = dom.create
+ class: className,
+ _.escape message
- # Should really filter on original message, not escaped.
+ # Should really filter on original message, not escaped.
- unless filter div
- div.hide()
+ unless filter div
+ div.hide()
- messages.append div
+ messages.append div
- # A slightly clumsy way to ensure that the container is scrolled to the bottom.
- _.delay -> messages.element.scrollTop = messages.element.scrollHeight
+ # A slightly clumsy way to ensure that the container is scrolled to the bottom.
+ _.delay -> messages.element.scrollTop = messages.element.scrollHeight
level = (className, consolefn) ->
(message) ->