added jquery to static site
Had to switch to toWaiAppPlain to avoid a seeming bug in toWaiApp; chromium only received a partial copy of jquery. Always the same length each time, which makes me think it's a bug in the compression, although a bug in the autohead middleware is also a possibility. Anyway, there's little need for compression for a local webapp. Not wasting time compressing things is probably a net gain. Similarly, I've not worried about minifying this yet. Although that would avoid bloating the git-annex binary quite so much.
This commit is contained in:
parent
ff4ab6d6da
commit
1983ca2852
3 changed files with 9010 additions and 3 deletions
|
@ -88,7 +88,7 @@ autoUpdate poll gethtml home ms_delay ms_startdelay = do
|
|||
{- Use long polling to update the status display. -}
|
||||
let delay = show ms_delay
|
||||
let startdelay = show ms_startdelay
|
||||
addScriptRemote "http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"
|
||||
addScript $ StaticR jquery_full_js
|
||||
$(widgetFile "longpolling")
|
||||
where
|
||||
ms_to_seconds :: Int -> Int
|
||||
|
@ -132,7 +132,7 @@ getConfigR = defaultLayout $ do
|
|||
webAppThread :: ThreadState -> DaemonStatusHandle -> IO ()
|
||||
webAppThread st dstatus = do
|
||||
webapp <- mkWebApp st dstatus
|
||||
app <- toWaiApp webapp
|
||||
app <- toWaiAppPlain webapp
|
||||
app' <- ifM debugEnabled
|
||||
( return $ httpDebugLogger app
|
||||
, return app
|
||||
|
|
28
debian/copyright
vendored
28
debian/copyright
vendored
|
@ -24,8 +24,34 @@ License: BSD-3-clause
|
|||
Utility/libmounts.c in this package's source, or in
|
||||
/usr/share/common-licenses/BSD on Debian systems.
|
||||
|
||||
Files: doc/logo.png doc/logo_small.png doc/favicon.png
|
||||
Files: doc/logo.png doc/logo_small.png */favicon.ico
|
||||
Copyright: 2007 Henrik Nyh <http://henrik.nyh.se/>
|
||||
2010 Joey Hess <joey@kitenet.net>
|
||||
License: other
|
||||
Free to modify and redistribute with due credit, and obviously free to use.
|
||||
|
||||
Files: static/jquery*
|
||||
Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer
|
||||
© 2011 The Dojo Foundation
|
||||
License: MIT or GPL-2
|
||||
The full text of version 2 of the GPL is distributed in
|
||||
/usr/share/common-licenses/GPL-2 on Debian systems.
|
||||
.
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of this software and associated documentation files (the
|
||||
"Software"), to deal in the Software without restriction, including
|
||||
without limitation the rights to use, copy, modify, merge, publish,
|
||||
distribute, sublicense, and/or sell copies of the Software, and to
|
||||
permit persons to whom the Software is furnished to do so, subject to
|
||||
the following conditions:
|
||||
.
|
||||
The above copyright notice and this permission notice shall be
|
||||
included in all copies or substantial portions of the Software.
|
||||
.
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
|
8981
static/jquery.full.js
Normal file
8981
static/jquery.full.js
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue