From 46007270e0a1ebbf0e7573072fbc3429ec5787d7 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Tue, 2 Dec 2014 04:41:34 -0800 Subject: fix open-close button --- build.sbt | 9 +++------ examples/demos/src/main/scala/scrollmenu/ScrollMenu.scala | 8 ++++++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/build.sbt b/build.sbt index 1b095e2..4b1d7dd 100644 --- a/build.sbt +++ b/build.sbt @@ -125,16 +125,13 @@ lazy val book = Project( .setMessage(".") .call() - repo.rebase().setUpstream("gh-pages").call() - repo.fetch() - .setRemote(remoteUrl) - .setRefSpecs(new RefSpec("refs/heads/gh-pages:refs/heads/gh-pages")) - .call() repo.push() .setRemote(remoteUrl) .setCredentialsProvider(creds) - .setRefSpecs(new RefSpec("refs/heads/master:refs/heads/gh-pages")) + .setRefSpecs(new RefSpec("master:gh-pages")) + .setForce(true) .call() + streams.value.log("Pushing to Github Pages complete!") } ) diff --git a/examples/demos/src/main/scala/scrollmenu/ScrollMenu.scala b/examples/demos/src/main/scala/scrollmenu/ScrollMenu.scala index b35ed2e..06ff753 100644 --- a/examples/demos/src/main/scala/scrollmenu/ScrollMenu.scala +++ b/examples/demos/src/main/scala/scrollmenu/ScrollMenu.scala @@ -140,7 +140,8 @@ class ScrollSpy(structure: Tree[String], } walkHide(child) val size = walkTree(rest) + children.length - mn.frag.children(1).asInstanceOf[dom.HTMLElement].style.maxHeight = size * 44 + "px" + mn.frag.children(1).asInstanceOf[dom.HTMLElement].style.maxHeight = + if (!open) size * 44 + "px" else "none" size } @@ -149,7 +150,10 @@ class ScrollSpy(structure: Tree[String], frag.children(0).classList.remove("pure-menu-selected") frag.classList.add("hide") - frag.children(1).asInstanceOf[dom.HTMLElement].style.maxHeight = "0px" + + frag.children(1).asInstanceOf[dom.HTMLElement].style.maxHeight = + if (!open) "0px" else "none" + if (tree.value.start < winItem.start) frag.classList.add("selected") else frag.classList.remove("selected") tree.children.foreach(walkHide) -- cgit v1.2.3