Code

Feature/2.1 search within#995

Code

Closed

jeffreycwitt wants to merge 77 commits intoProjectMirador:release2.1ProjectMirador/mirador:release2.1from jeffreycwitt:feature/2.1-search-withinjeffreycwitt/mirador:feature/2.1-search-withinCopy head branch name to clipboard

+6,673-149,869

Commits

Commits on Sep 17, 2015

• modifications to index.html

  jeffreycwitt

  committed
  947d68b

  Copy full SHA for 947d68b

• added quotes to string value in selectdataset function

  jeffreycwitt

  committed
  47bc246

  Copy full SHA for 47bc246

• commented out unused customization values windowObjects and annotaitonEndpoint

  jeffreycwitt

  committed
  bfa9c2f

  Copy full SHA for bfa9c2f

• added scta logo

  jeffreycwitt

  committed
  bf84407

  Copy full SHA for bf84407

• removed old code in index.html from pre-2.0 commit

  jeffreycwitt

  committed
  0d8ded3

  Copy full SHA for 0d8ded3

Commits on Sep 24, 2015

• modifications to index.html

  jeffreycwitt

  committed
  00e5402

  Copy full SHA for 00e5402

• added quotes to string value in selectdataset function

  jeffreycwitt

  committed
  d06723f

  Copy full SHA for d06723f

• commented out unused customization values windowObjects and annotaitonEndpoint

  jeffreycwitt

  committed
  e1f0994

  Copy full SHA for e1f0994

• added scta logo

  jeffreycwitt

  committed
  94a427a

  Copy full SHA for 94a427a

• removed old code in index.html from pre-2.0 commit

  jeffreycwitt

  committed
  3414b5b

  Copy full SHA for 3414b5b

• commented out test windowObjects section

  jeffreycwitt

  committed
  5c2453a

  Copy full SHA for 5c2453a

• finishing merge after rebase and conflicts

  jeffreycwitt

  committed
  9ab613e

  Copy full SHA for 9ab613e

Commits on Oct 9, 2015

• peformed git pull from upstream master; includes bug fix for table of contents ranges that don't include all canvas; i.e. fixes bug seen in Gracilis manuscript display

  jeffreycwitt

  committed
  8861c79

  Copy full SHA for 8861c79

Commits on Oct 15, 2015

• progress on searhWithin in overlay panel

  jeffreycwitt

  committed
  51aa559

  Copy full SHA for 51aa559

• small commented out addition to toggleSearchWitinOverlay()

  jeffreycwitt

  committed
  1ea56ee

  Copy full SHA for 1ea56ee

• more messing around with search within

  jeffreycwitt

  committed
  426438a

  Copy full SHA for 426438a

• added to manifest to index.html

  jeffreycwitt

  committed
  c1dd322

  Copy full SHA for c1dd322

• progress on searhWithin in overlay panel

  jeffreycwitt

  committed
  87fa56c

  Copy full SHA for 87fa56c

• small commented out addition to toggleSearchWitinOverlay()

  jeffreycwitt

  committed
  a0fe06a

  Copy full SHA for a0fe06a

• more messing around with search within

  jeffreycwitt

  committed
  df6711b

  Copy full SHA for df6711b

Commits on Oct 25, 2015

• got searchWithin results window to appear with results and effective linking to change canvas to target of search results. Functions have been embedded into window.js as part of $.Window object, bu…

  Show description for 5471bf9
  jeffreycwitt

  committed
  5471bf9

  Copy full SHA for 5471bf9

• fixed merge problems

  jeffreycwitt

  committed
  f318120

  Copy full SHA for f318120

Commits on Oct 28, 2015

• moved main functionality of search within to $.SearchWithin object to conform to more closely to mirador organization; main functionality continues to be working

  jeffreycwitt

  committed
  611b4ff

  Copy full SHA for 611b4ff

Commits on Oct 29, 2015

• more rarefactoring in search within object; new manifest added to index file

  jeffreycwitt

  committed
  08feeba

  Copy full SHA for 08feeba

• changes in searchWithin object to adjust when hits property is present and to modify annotation list to show highlighting of search results

  jeffreycwitt

  committed
  a707372

  Copy full SHA for a707372

Commits on Oct 31, 2015

• adjusted getSearchWithinService function on manifest object to handle array or object as value of service field. function now check context to see if this is the service for searching

  jeffreycwitt

  committed
  cbf03da

  Copy full SHA for cbf03da

• saved some lingering changes

  jeffreycwitt

  committed
  bd296d9

  Copy full SHA for bd296d9

Commits on Nov 1, 2015

• removed unnecessary console logs; bugs lingering when more than one manifest is open in the workspace

  jeffreycwitt

  committed
  95f3407

  Copy full SHA for 95f3407

• major changes to events to fix bugs when multiple slots were open; search within form added to window template

  jeffreycwitt

  committed
  153030e

  Copy full SHA for 153030e

Commits on Nov 7, 2015

• minor adjustments to searchWithin.js object

  jeffreycwitt

  committed
  d0adc55

  Copy full SHA for d0adc55

Commits on Dec 21, 2015

• * General formatting/white spaces

  Show description for ae61afd
  jabrah

  committed
  ae61afd

  Copy full SHA for ae61afd

• function getSearchAnnotations modify how canvasid, label, and coordinates are found to match the getHits function

  jabrah

  committed
  808958b

  Copy full SHA for 808958b

Commits on Jan 14, 2016

• completed merge from john's fork

  jeffreycwitt

  committed
  d7691e5

  Copy full SHA for d7691e5

Commits on Jan 19, 2016

• Search result labels now default to annotation label, if not found it will use canvas label. Modify how canvas labels are found.

  jabrah

  committed
  bd8e465

  Copy full SHA for bd8e465

Commits on Jan 21, 2016

• Merge branch 'search-within-aor' of https://github.com/jhu-digital-manuscripts/mirador into jhu-digital-manuscripts-search-within-aor

  jeffreycwitt

  committed
  2433f91

  Copy full SHA for 2433f91

Commits on Jan 28, 2016

• Search results pointing to canvases that do not exist are now ignored.

  jabrah

  committed
  fde7eca

  Copy full SHA for fde7eca

Commits on Feb 8, 2016

• Get label from resources.resource.label before for canvas labels

  jabrah

  committed
  cb25bdd

  Copy full SHA for cb25bdd

• resovled conflicts during merge

  jeffreycwitt

  committed
  3d477c7

  Copy full SHA for 3d477c7

• Merge branch 'jhu-digital-manuscripts-search-within-aor' into feature/search-within

  jeffreycwitt

  committed
  f3a9dbd

  Copy full SHA for f3a9dbd

• removed unused 'close' button in template

  jeffreycwitt

  committed
  be0d98d

  Copy full SHA for be0d98d

Commits on Feb 18, 2016

• added two manifests two index file

  jeffreycwitt

  committed
  c56ebdf

  Copy full SHA for c56ebdf

Commits on Mar 11, 2016

• bonaventure manifest added

  jeffreycwitt

  committed
  dc2eb55

  Copy full SHA for dc2eb55

Commits on Mar 28, 2016

• Separate SearchWithin code into distinct JS file. Rename 'searchWithin' to 'searchWithinResults'

  jabrah

  committed
  3cdd82c

  Copy full SHA for 3cdd82c

Commits on Apr 4, 2016

• segment.io script added

  jeffreycwitt

  committed
  5e4a8d1

  Copy full SHA for 5e4a8d1

Commits on Apr 6, 2016

• Merge branch 'jhu-digital-manuscripts-jwitt-search-within-separate' into feature/search-within

  jeffreycwitt

  committed
  691b6ad

  Copy full SHA for 691b6ad

• successfully merged old search within code into 2.1 branch; all search within modifications to window.js were not accepted because we need to move the search within widget to the new tab system

  jeffreycwitt

  committed
  2fe9d71

  Copy full SHA for 2fe9d71

• made adjustments to side panel to add search tab; things are not working yet but getting closer

  jeffreycwitt

  committed
  783e391

  Copy full SHA for 783e391

• further adjustments to search tab

  jeffreycwitt

  committed
  bfdad17

  Copy full SHA for bfdad17

• more progress toward searchTab; added blank searchTab.js file:

  jeffreycwitt

  committed
  7b77616

  Copy full SHA for 7b77616

• progress getting search results into panel; lingering problem is tabbing back to index does not clear search results.

  jeffreycwitt

  committed
  2d8973c

  Copy full SHA for 2d8973c

• removed unnecessary parent property declaration

  jeffreycwitt

  committed
  ddce3f3

  Copy full SHA for ddce3f3

Commits on Apr 7, 2016

• modified css; tabs sort of work; but if you click the same tab twice the toggle sequence gets out of order and it doesn't work properly

  jeffreycwitt

  committed
  7b3c21b

  Copy full SHA for 7b3c21b

• resolved tab issue; added condition to getSearchAnnotations to check for null results

  jeffreycwitt

  committed
  8ddc595

  Copy full SHA for 8ddc595

• progress on adding expanded form to search tab; still kink in query toggle functions

  jeffreycwitt

  committed
  8eab66c

  Copy full SHA for 8eab66c

Commits on Apr 9, 2016

• added changes to searchTab.js from John's early commit

  jeffreycwitt

  committed
  fd891be

  Copy full SHA for fd891be

• added code to pass full set of query parameters to ajax request where a url query_string is created for non null values

  jeffreycwitt

  committed
  93578ed

  Copy full SHA for 93578ed

Commits on Apr 18, 2016

• changed line 69 in tab.js to allow tabs to work in multiple windows

  jeffreycwitt

  committed
  4c08a7d

  Copy full SHA for 4c08a7d

• small change

  jeffreycwitt

  committed
  5e7f7ab

  Copy full SHA for 5e7f7ab

Commits on Apr 19, 2016

• Cumulative changes to implement paging.

  jabrah

  committed
  2b8836a

  Copy full SHA for 2b8836a

Commits on Apr 20, 2016

• Merge pull request #4 from jhu-digital-manuscripts/feature/2.1-search-sans-master

  Show description for 48e0350
  jeffreycwitt

  committed
  48e0350

  Copy full SHA for 48e0350

• created display of total search results, and display of ranges for current page; I also turned on annotations; not lots of jsonblob errors at present, I'm not sure where that is coming from

  jeffreycwitt

  committed
  3cdf265

  Copy full SHA for 3cdf265

• more updates to searchTab.js; removal of searchWidget.js; several TODOs added in comments

  jeffreycwitt

  committed
  33a77ed

  Copy full SHA for 33a77ed

Commits on Jun 22, 2016

• changes sidePanel.js to only activate search tab when search service is detected

  jeffreycwitt

  committed
  8a06bcf

  Copy full SHA for 8a06bcf

• allowed search tab to deal with mutliple search service blocks; also dispalys search block label in search service drop down menu

  jeffreycwitt

  committed
  26be893

  Copy full SHA for 26be893

• fixed error in paging problem

  jeffreycwitt

  committed
  99e4cbb

  Copy full SHA for 99e4cbb

Commits on Jun 23, 2016

• Merge in IIIF/Mirador/release2.1, broke the search tab.

  jabrah

  committed
  7ffb9c9

  Copy full SHA for 7ffb9c9

• Search tab now displays correctly.

  jabrah

  committed
  9170df1

  Copy full SHA for 9170df1

• Fixed issue with pager scope. Clicking on search results now navigates to associated page as expected. Removed various console logs.

  jabrah

  committed
  b840187

  Copy full SHA for b840187

Commits on Jun 24, 2016

• Merge pull request #5 from jhu-digital-manuscripts/search-within-merge

  Show description for b13d667
  jeffreycwitt

  authored
  b13d667

  Copy full SHA for b13d667

• modified back to my custom index page

  jeffreycwitt

  committed
  d3c2254

  Copy full SHA for d3c2254

Commits on Jun 30, 2016

• modified index

  jeffreycwitt

  committed
  e82eabb

  Copy full SHA for e82eabb

Commits on Jul 10, 2016

• complete merge

  jeffreycwitt

  committed
  5eb4a81

  Copy full SHA for 5eb4a81

Commits on Jul 30, 2016

• merged from upstream/release2.1

  jeffreycwitt

  committed
  f521f40

  Copy full SHA for f521f40

Commits on Aug 23, 2016

• merge with 2.1 release candidate

  jeffreycwitt

  committed
  b533af5

  Copy full SHA for b533af5

• merge clean up

  jeffreycwitt

  committed
  02a8259

  Copy full SHA for 02a8259

Commits on Aug 28, 2016

• added position fixed to index file css

  jeffreycwitt

  committed
  994d22a

  Copy full SHA for 994d22a

Commits on Oct 17, 2016

• completed merge with 2.1.1

  jeffreycwitt

  committed
  f2a4df2

  Copy full SHA for f2a4df2