Skip to content

Commit

Permalink
Merge pull request #437 from DDMAL/filter_queue
Browse files Browse the repository at this point in the history
Manipulation Plugin and Page Labels
  • Loading branch information
ahankinson authored Aug 30, 2018
2 parents 3b09bc1 + 4ea7ec4 commit a8db239
Show file tree
Hide file tree
Showing 31 changed files with 1,855 additions and 1,841 deletions.
3 changes: 2 additions & 1 deletion .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"globals": {
"define": true,
"expect": true,
"assert": true
"assert": true,
"Diva": true
},
"validthis": true
}
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@ cache:
- node_modules

install:
- sudo apt-get install -yq libcairo2-dev libjpeg-dev libpango1.0-dev libgif-dev build-essential g++
- npm install --no-spin

script:
- npm run build:production
- npm run lint
- npm test

Expand Down
21 changes: 0 additions & 21 deletions demo/index.html

This file was deleted.

2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
document.addEventListener('DOMContentLoaded', function ()
{
diva = new Diva('diva-wrapper', {
objectData: "test/manifests/iiifv3.json",
objectData: "./test/manifests/iiifv3.json",
plugins: [Diva.DownloadPlugin, Diva.ManipulationPlugin, Diva.MetadataPlugin]
});
}, false)
Expand Down
Loading

0 comments on commit a8db239

Please sign in to comment.