Mike Taylor [Tue, 30 Jun 2015 11:02:21 +0000 (12:02 +0100)]
Merge branch 'master' into urlstate
Mike Taylor [Tue, 30 Jun 2015 10:10:47 +0000 (11:10 +0100)]
Tidying up after ACREP-32.
Remove another extraneous warning from URL analysis.
Warn when seeing a so-called link that is not a valid URL.
Mike Taylor [Tue, 30 Jun 2015 10:08:02 +0000 (11:08 +0100)]
Remove extraneous warning from URL analysis.
Mike Taylor [Mon, 29 Jun 2015 19:20:14 +0000 (20:20 +0100)]
Remove extraneous debugging from calculation of bestLink and
otherLinks. Allows us to merge two branches.
Mike Taylor [Mon, 29 Jun 2015 19:05:00 +0000 (20:05 +0100)]
Part of ACREP-32.
Remove the Handlebars helpers 'mkws-best-url' and 'mkws-other-urls'.
The relevant logic is now in the widget itself.
I hope this will make Jason happy.
Mike Taylor [Mon, 29 Jun 2015 19:04:11 +0000 (20:04 +0100)]
Main part of ACREP-32.
The 'records' handler now adds two new fields to the data objects that it renders:
* bestLink -- a single URL, is there is a good electronic-url.
* otherLinks -- all other electronic-urls, whether well-formed or not.
Mike Taylor [Mon, 29 Jun 2015 19:02:46 +0000 (20:02 +0100)]
Part of ACREP-32.
Add new Handlebars helper mkws-indexplus.
Emits the current index in an iteration, plus a constant.
Mike Taylor [Mon, 29 Jun 2015 16:34:05 +0000 (17:34 +0100)]
Resolve conflicts from merge of master into urlstate
Mike Taylor [Fri, 26 Jun 2015 17:30:12 +0000 (18:30 +0100)]
Downgrade warn() calls to debug()
Mike Taylor [Fri, 26 Jun 2015 17:25:56 +0000 (18:25 +0100)]
Part of ACREP-32.
Provide new Handlebars helper mkws-best-url, which returns the first
item in a list that matches a regular-expression suggesting that it's
a URL (basically anything that starts with http://, https:// or //).
Also provide mkws-other-urls (not yet tested), which returns all the
other URLs in the list except the first.
Wolfram Schneider [Thu, 25 Jun 2015 09:13:31 +0000 (11:13 +0200)]
ignore SSL errors for local tests, part of MKWS-391
phantomjs --ignore-ssl-errors=true
Wolfram Schneider [Tue, 23 Jun 2015 20:44:39 +0000 (20:44 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws
Wolfram Schneider [Tue, 23 Jun 2015 20:41:59 +0000 (20:41 +0000)]
fix demo index files
Wolfram Schneider [Tue, 23 Jun 2015 20:41:34 +0000 (20:41 +0000)]
correct index URL
Wolfram Schneider [Tue, 23 Jun 2015 20:36:22 +0000 (20:36 +0000)]
create an index.html file
Jason Skomorowski [Tue, 23 Jun 2015 19:18:45 +0000 (15:18 -0400)]
Hide broken images MAR-162
Wolfram Schneider [Tue, 23 Jun 2015 16:39:06 +0000 (16:39 +0000)]
the list of pages in the iframe is pretty long now, split it
into 2 pieces, one for example.indexdata.com sites and one
for all other hostnames.
Wolfram Schneider [Tue, 23 Jun 2015 15:38:27 +0000 (15:38 +0000)]
add http://mkdru.indexdata.com/
Wolfram Schneider [Tue, 23 Jun 2015 14:56:33 +0000 (14:56 +0000)]
The One Repo: http://onerepo.net/
Wolfram Schneider [Tue, 23 Jun 2015 14:55:56 +0000 (14:55 +0000)]
add MKX OA demo library: sample.mkx.indexdata.com
Wolfram Schneider [Tue, 23 Jun 2015 14:53:43 +0000 (14:53 +0000)]
check our infamous MK2 demo site mk2.indexdata.com
Wolfram Schneider [Tue, 23 Jun 2015 14:52:46 +0000 (14:52 +0000)]
topic search for "global warming"
Wolfram Schneider [Tue, 23 Jun 2015 14:48:38 +0000 (14:48 +0000)]
add test examples for "nuclear power"
Wolfram Schneider [Tue, 23 Jun 2015 14:46:27 +0000 (14:46 +0000)]
remove whitespace line
Wolfram Schneider [Tue, 23 Jun 2015 14:38:59 +0000 (14:38 +0000)]
the wimp search for "faubus" no longer works, eat sushi instead
Wolfram Schneider [Tue, 23 Jun 2015 14:38:10 +0000 (14:38 +0000)]
add mkwscat.html, part of MAR-161
Mike Taylor [Fri, 5 Jun 2015 08:36:49 +0000 (09:36 +0100)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws
Wolfram Schneider [Thu, 4 Jun 2015 10:51:31 +0000 (10:51 +0000)]
try out /bin/bash for job control, SA-739
Wolfram Schneider [Thu, 4 Jun 2015 08:26:16 +0000 (08:26 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws
Mike Taylor [Wed, 3 Jun 2015 16:26:18 +0000 (17:26 +0100)]
Part of ACREP-35, and surely the last part?
Establish local $ as a copy of mkws.$.
This is not necessary when running using a local copy of MKWS, when $
already has that value. But for reasons that I don't understand at
all, $ is undefined when running the exact same code using a copy of
MKWS from the production server.
Mike Taylor [Wed, 3 Jun 2015 16:26:18 +0000 (17:26 +0100)]
Part of ACREP-35, and surely the last part?
Establish local $ as a copy of mkws.$.
This is not necessary when running using a local copy of MKWS, when $
already has that value. But for reasons that I don't understand at
all, $ is undefined when running the exact same code using a copy of
MKWS from the production server.
Mike Taylor [Mon, 1 Jun 2015 16:05:39 +0000 (17:05 +0100)]
Remove trailing blank line.
Mike Taylor [Fri, 22 May 2015 15:25:28 +0000 (16:25 +0100)]
Remove old debugging output for freezing/unfreezing records.
Mike Taylor [Fri, 22 May 2015 10:53:39 +0000 (11:53 +0100)]
Merge branch 'master' into urlstate
Mike Taylor [Fri, 22 May 2015 10:53:21 +0000 (11:53 +0100)]
Part of ACREP-35.
From the "categories" widget, remove the unnecessary and harmful check
that authentication has been completed. Of course it generally has NOT
at the time the widget is created, resulting in an assertion-failure.
But this is unnecessary anyway, because the body of the widget's code
is in any case run as a callback when authentication is complete.
Mike Taylor [Fri, 22 May 2015 07:10:25 +0000 (08:10 +0100)]
Merge branch 'master' into urlstate
Wolfram Schneider [Thu, 21 May 2015 09:01:52 +0000 (09:01 +0000)]
IE11 CSS parsing in regression tests, MKWS-386
Wolfram Schneider [Thu, 21 May 2015 08:57:30 +0000 (08:57 +0000)]
IE11 CSS parsing in regression tests, MKWS-386
Mike Taylor [Fri, 15 May 2015 12:59:55 +0000 (12:59 +0000)]
mkws-examples config file in urlstate branch copied from that in master branch. I don't understand how they diverged, but at least knowing they DID diverge explains why we were running from the wrong DocumentRoot
Mike Taylor [Fri, 15 May 2015 12:56:06 +0000 (12:56 +0000)]
For reasons that I don't understand, example.indexdata.com was
using DocumentRoot /home/indexdata/mkws/examples/htdocs/.
I patched it up to use /home/indexdata/demos instead for today's demo.
But I want to understand how it got like this.
Mike Taylor [Wed, 13 May 2015 16:23:16 +0000 (17:23 +0100)]
Part of MKWS-387.
Remove mkws.limitTarget and mkws.limitQuery functions.
THis stuff is now handled from inside the team.
Mike Taylor [Wed, 13 May 2015 16:22:31 +0000 (17:22 +0100)]
limitQuery() and limitTarget are now pure local functions, not members.
Mike Taylor [Wed, 13 May 2015 16:17:33 +0000 (17:17 +0100)]
Lazier handling of what gets updated when hash changes.
Support "query" in hash fragment.
Jason Skomorowski [Tue, 12 May 2015 18:17:51 +0000 (14:17 -0400)]
Revert "Added examples/htdocs/widgetsrising because IT WAS ON THE LIVE SITE BUT NOT CHECKED IN. I have no idea what it is, but Jason owns the files, so presumably he can comment"
This reverts commit
5f39e98368832c582017b10f9ce0bb77eb441c44.
These files are a mockup that more rightly lives in the demos repo but
predates that.
Mike Taylor [Tue, 12 May 2015 10:29:50 +0000 (11:29 +0100)]
Remove no-longer-needed warnings from facets widget.
Mike Taylor [Tue, 12 May 2015 10:29:26 +0000 (11:29 +0100)]
Facet widget now uses filterSet.deepCopy() instead of flawed $.extend() invocation.
Finally solves the evil aliasing problem that flummoxed me last night.
Thanks to Jakub for fruitful discussion.
Mike Taylor [Tue, 12 May 2015 10:26:32 +0000 (11:26 +0100)]
Eliminate base variable.
Mike Taylor [Tue, 12 May 2015 10:26:16 +0000 (11:26 +0100)]
Remove unusual teamName variable.
Mike Taylor [Tue, 12 May 2015 10:15:16 +0000 (11:15 +0100)]
Fix the deepCopy() method to extend an empty array instead of object.
Remove debugging output from deepCopy().
Remove _list() private accessor method.
Mike Taylor [Tue, 12 May 2015 10:01:49 +0000 (11:01 +0100)]
Add deepCopy() method (not yet working) and the private methods that it uses.
Mike Taylor [Tue, 12 May 2015 09:21:47 +0000 (10:21 +0100)]
Insert missing semicolons after function assignments.
Mike Taylor [Tue, 12 May 2015 08:59:41 +0000 (08:59 +0000)]
Inexplicable changes to examples/apache2/mkws-examples which SOMEONE MADE AND DID NOT CHECK IN. I don't know what their intention was. Come ON, people.
Mike Taylor [Tue, 12 May 2015 08:57:42 +0000 (08:57 +0000)]
Added examples/htdocs/widgetsrising because IT WAS ON THE LIVE SITE BUT NOT CHECKED IN. I have no idea what it is, but Jason owns the files, so presumably he can comment
Mike Taylor [Tue, 12 May 2015 08:50:30 +0000 (09:50 +0100)]
Use an unchanging base. Still doesn't help.
Mike Taylor [Tue, 12 May 2015 07:35:46 +0000 (08:35 +0100)]
Simplify to a version that still doesn't work, but in the same way.
Mike Taylor [Mon, 11 May 2015 22:18:22 +0000 (23:18 +0100)]
Attempt to generate filter fragments that are a based on the
prevailing state.
This DOES NOT WORK due to an aliasing bug that I can make no sense
of. I'll discuss this with Jakub tomorrow.
Mike Taylor [Mon, 11 May 2015 14:05:05 +0000 (15:05 +0100)]
Re-fix ACREP-30 in a way that works on production.
The regular expression that recognises harvested targets now works
correctly on either ZURL-style or UDB-style target identifiers. (The
question of why we get the first on the production system and the
second on my development system is a whole nother ball of wax.)
Mike Taylor [Mon, 11 May 2015 14:05:05 +0000 (15:05 +0100)]
Re-fix ACREP-30 in a way that works on production.
The regular expression that recognises harvested targets now works
correctly on either ZURL-style or UDB-style target identifiers. (The
question of why we get the first on the production system and the
second on my development system is a whole nother ball of wax.)
Mike Taylor [Mon, 11 May 2015 13:34:06 +0000 (14:34 +0100)]
Merge branch 'master' into urlstate
Mike Taylor [Mon, 11 May 2015 13:32:27 +0000 (14:32 +0100)]
Fixes ACREP-30.
Add new "Type" column to targets-table template.
Mike Taylor [Mon, 11 May 2015 13:30:10 +0000 (14:30 +0100)]
Part of ACREP-30.
Extend the "compared" Handlebars helper to implement a "matches"
operator for regular-expression matching.
Mike Taylor [Mon, 11 May 2015 13:32:27 +0000 (14:32 +0100)]
Fixes ACREP-30.
Add new "Type" column to targets-table template.
Mike Taylor [Mon, 11 May 2015 13:30:10 +0000 (14:30 +0100)]
Part of ACREP-30.
Extend the "compared" Handlebars helper to implement a "matches"
operator for regular-expression matching.
Mike Taylor [Mon, 11 May 2015 11:44:06 +0000 (12:44 +0100)]
Extend targets-template comment to note that we have the "name" field.
Wolfram Schneider [Mon, 11 May 2015 08:44:44 +0000 (08:44 +0000)]
better description
Wolfram Schneider [Sun, 10 May 2015 16:09:48 +0000 (16:09 +0000)]
configure watitime for Records/Targets check
Wolfram Schneider [Sun, 10 May 2015 16:06:25 +0000 (16:06 +0000)]
wait a little bit for source facets to avoid race conditions of source facets updates, MKWS-385
Mike Taylor [Fri, 8 May 2015 23:04:44 +0000 (00:04 +0100)]
Support target and field facets in hashchange handler.
Working nicely!
Mike Taylor [Fri, 8 May 2015 22:50:13 +0000 (23:50 +0100)]
Facet widgets now generate HREFs with facet data in fragments instead of actions.
Mike Taylor [Fri, 8 May 2015 22:49:01 +0000 (23:49 +0100)]
facet template now uses href instead of linkdata.
Mike Taylor [Fri, 8 May 2015 20:11:05 +0000 (21:11 +0100)]
Revert to
b64fc897f864920691f5395eea44f7d534bd4551
Overrides in urlFragment can after all replace the set of filters.
Mike Taylor [Fri, 8 May 2015 20:07:37 +0000 (21:07 +0100)]
Extend state by filter entries and overrides in a single shot.
Mike Taylor [Fri, 8 May 2015 20:07:07 +0000 (21:07 +0100)]
Extend state by overrides AFTER generating filter entries, not before.
Mike Taylor [Fri, 8 May 2015 20:06:43 +0000 (21:06 +0100)]
In urlFragment, break creation of temporary state in two.
Mike Taylor [Fri, 8 May 2015 19:52:54 +0000 (20:52 +0100)]
Do not pass unused field "field" into facet template.
Mike Taylor [Fri, 8 May 2015 19:52:36 +0000 (20:52 +0100)]
Remove unused field "field" from facet template.
Mike Taylor [Fri, 8 May 2015 19:41:23 +0000 (20:41 +0100)]
Merge branch 'master' into urlstate
Wolfram Schneider [Thu, 7 May 2015 15:08:07 +0000 (15:08 +0000)]
assume batch testing if running on localhost:4040
Wolfram Schneider [Thu, 7 May 2015 14:52:57 +0000 (14:52 +0000)]
enable to tune timeouts, MKWS-384
This can be activated with the URL parameter &second=number
second is by default 1000 ms. To increase the
value by 2, use &second=2000
Mike Taylor [Sat, 2 May 2015 19:14:10 +0000 (20:14 +0100)]
Part of MKWS-64.
Handle changes in "size" state.
Mike Taylor [Sat, 2 May 2015 19:13:56 +0000 (20:13 +0100)]
Part of MKWS-64.
When a page-size is selected, update the URL rather then changing
state directly.
Mike Taylor [Sat, 2 May 2015 19:07:07 +0000 (20:07 +0100)]
Handle changes in "sort" state.
Mike Taylor [Sat, 2 May 2015 19:06:33 +0000 (20:06 +0100)]
Part of MKWS-64.
When a sort-criterion is selected, update the URL (though the wonder
of assigning to window.location.href) rather then changing state
directly.
Mike Taylor [Sat, 2 May 2015 17:26:26 +0000 (18:26 +0100)]
Recognise all state-changes from fragments.
Handle the first of these: switching to a different page.
Mike Taylor [Fri, 1 May 2015 20:53:52 +0000 (21:53 +0100)]
Towards MKWS-64.
Dispatch team.handleChanges() for every team represented in the new
fragment.
Mike Taylor [Fri, 1 May 2015 20:52:36 +0000 (21:52 +0100)]
Towards MKWS-64.
New (incomplete) function handleChanges(), compares old and new state
objects to determine what's changed ... but doesn't yet act on it.
Mike Taylor [Fri, 1 May 2015 19:57:48 +0000 (20:57 +0100)]
Expand mkws-core parse_fragment() function to parse apart the
individual teams' sets of parameters.
Mike Taylor [Fri, 1 May 2015 19:54:36 +0000 (20:54 +0100)]
Add team method parseFragment()
Mike Taylor [Fri, 1 May 2015 16:27:49 +0000 (17:27 +0100)]
First part of parsing hash fragment.
Mike Taylor [Fri, 1 May 2015 16:26:33 +0000 (17:26 +0100)]
Comment out old, no-longer-needed debugging.
Jason Skomorowski [Fri, 1 May 2015 16:03:24 +0000 (12:03 -0400)]
Revert "Jasmine now expects --forceExit to be case-sensitive"
This reverts commit
80ab3be75c7e6df9f2d23660fb9ff14d5f31dd21.
...the node ecosystem is insane. "npm update" seems to have installed
a beta version. To update stable packages I apparently need to do
rm -rf node_modules && npm install. Which is silly.
Mike Taylor [Fri, 1 May 2015 15:31:01 +0000 (16:31 +0100)]
Remove old commented-out debugging output.
Mike Taylor [Fri, 1 May 2015 15:29:13 +0000 (16:29 +0100)]
Make freeze/unfreeze debug output more consistent.
Mike Taylor [Fri, 1 May 2015 15:27:26 +0000 (16:27 +0100)]
Remove extraneous warning in team.urlFragment().
Mike Taylor [Fri, 1 May 2015 15:16:15 +0000 (16:16 +0100)]
Merge branch 'master' into urlstate
Jason Skomorowski [Fri, 1 May 2015 14:34:32 +0000 (10:34 -0400)]
Handlebars 3.0.3
Jason Skomorowski [Fri, 1 May 2015 14:10:53 +0000 (10:10 -0400)]
Remove deprecated sample spec from old Jasmine docs
Jason Skomorowski [Fri, 1 May 2015 13:56:20 +0000 (09:56 -0400)]
Jasmine now expects --forceExit to be case-sensitive
Mike Taylor [Fri, 1 May 2015 13:52:58 +0000 (14:52 +0100)]
Part of MKWS-64.
The pager widget uses team.urlFragment() to generate state-summarising
links for the values passed into the template, rather then click
actions.
Mike Taylor [Fri, 1 May 2015 13:51:47 +0000 (14:51 +0100)]
Part of MKWS-64.
Expand the urlFragment() method to accept an optional set of overrides
which take precedence over the values of the present state. This can
be used to generate fragments for actions which change state.