From 496d1cff016513e76e3e7cee9851f7683c636318 Mon Sep 17 00:00:00 2001 From: Juliette Regimbal Date: Mon, 10 Jun 2019 13:58:10 -0400 Subject: [PATCH 1/4] Update README for Neon 3.1.0 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 60067d644..3f7960062 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -Neon v3.0.0 +Neon v3.1.0 ===== -[![Build_Status](https://travis-ci.org/DDMAL/Neon2.svg?branch=develop)](https://travis-ci.org/DDMAL/Neon2) +[![Build_Status](https://travis-ci.org/DDMAL/Neon2.svg?branch=master)](https://travis-ci.org/DDMAL/Neon2) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) [![js-semistandard-style](https://img.shields.io/badge/code%20style-semistandard-brightgreen.svg?style=flat-square)](https://github.com/Flet/semistandard) From bcb2a1a59fc93296d51268d78eee3d28eae82a3a Mon Sep 17 00:00:00 2001 From: Juliette Regimbal Date: Mon, 10 Jun 2019 14:01:56 -0400 Subject: [PATCH 2/4] Update version number in package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9f9fca0c8..8fcd9eace 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Neon", - "version": "3.0.0", + "version": "3.1.0", "description": "A web-based editor for correcting MEI-Neume files", "main": "server.js", "license": "MIT", From 1acd8093d6b500cc4d704761ea5032251e79650f Mon Sep 17 00:00:00 2001 From: Juliette Regimbal Date: Mon, 17 Jun 2019 14:17:29 -0400 Subject: [PATCH 3/4] Update pages/editor.js for v3.1.0 --- pages/editor.js | 96 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/pages/editor.js b/pages/editor.js index 15477e555..5ada602d1 100644 --- a/pages/editor.js +++ b/pages/editor.js @@ -1,8 +1,103 @@ import NeonView from '../src/NeonView.js'; +import DisplayPanel from '../src/DisplayPanel/DisplayPanel.js'; +import DivaView from '../src/DivaView/DivaView.js'; +import SingleView from '../src/SingleView/SingleView.js'; +import SingleEditMode from '../src/SingleEdit/SingleEditMode.js'; +import InfoModule from '../src/InfoModule.js'; +import TextView from '../src/TextView.js'; + +import PouchDb from 'pouchdb'; +const $ = require('jquery'); let mei = getGetParam('page'); +let mode = getGetParam('mode'); +let map = new Map(); // Since in local mode there are no GET parameters, mei will be null +if (mode === 'demo-page') { + console.log('Demo page'); + $.get('./mei/' + mei + '.mei', (data) => { + map.set(0, data); + let params = { + mode: 'single', + options: { + image: './img/' + mei + '.png', + meiMap: map, + name: mei + }, + View: SingleView, + Display: DisplayPanel, + Info: InfoModule, + Edit: SingleEditMode, + TextView: TextView + }; + + var view = new NeonView(params); + view.start(); + }); +} else if (mode === 'demo-iiif') { + console.log('IIIF'); + let params = { + mode: 'iiif', + options: { + manifest: 'https://images.simssa.ca/iiif/manuscripts/cdn-hsmu-m2149l4/manifest.json' + }, + View: DivaView, + Display: DisplayPanel, + Info: InfoModule, + TextView: TextView + }; + if (mei === 'Salzinnes') { + console.log('Salzinnes'); + $.get('https://images.simssa.ca/iiif/manuscripts/cdn-hsmu-m2149l4/manifest.json').then((manifest) => { + params.options.name = manifest.label; + console.log(manifest); + return $.get('./mei/CF-017.mei'); + }).then((data) => { + console.log(18); + map.set(18, data); + return $.get('./mei/CF-018.mei'); + }).then((data) => { + console.log(20); + map.set(20, data); + return $.get('./mei/CF-019.mei'); + }).then((data) => { + map.set(22, data); + console.log(22); + params.options.meiMap = map; + var view = new NeonView(params); + view.start(); + }); + } +} else if (mode === 'user-page') { + let db = new PouchDb('neon-temporary'); + let params = { + mode: 'single', + options: { + name: 'User MEI' + }, + View: SingleView, + Edit: SingleEditMode, + Display: DisplayPanel, + Info: InfoModule, + TextView: TextView + }; + db.get('mei').then((doc) => { + map.set(0, doc.data); + params.options.meiMap = map; + return db.get('img'); + }).then((doc) => { + params.options.image = doc.data; + var view = new NeonView(params); + view.start(); + }).catch((err) => { + console.error(err); + }); +} else { + console.log('None of the above'); +} + +/* var view; if (mei === null) { view = new NeonView({ @@ -20,6 +115,7 @@ if (mei === null) { } view.start(); +*/ function getGetParam (paramName) { let result = null; From 2d3c06e67fe2d71322627f00f4263ee7e189bbd0 Mon Sep 17 00:00:00 2001 From: Juliette Regimbal Date: Tue, 18 Jun 2019 11:30:00 -0400 Subject: [PATCH 4/4] Update versions for release 3.1.1 --- README.md | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d5a36b636..180ad4ea3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -Neon (develop) +Neon v 3.1.1 ===== -[![Build_Status](https://travis-ci.org/DDMAL/Neon.svg?branch=develop)](https://travis-ci.org/DDMAL/Neon) +[![Build_Status](https://travis-ci.org/DDMAL/Neon.svg?branch=master)](https://travis-ci.org/DDMAL/Neon) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) [![js-semistandard-style](https://img.shields.io/badge/code%20style-semistandard-brightgreen.svg?style=flat-square)](https://github.com/Flet/semistandard) diff --git a/package.json b/package.json index 495a9b018..d9c1db6d1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Neon", - "version": "develop", + "version": "3.1.1", "description": "A web-based editor for correcting MEI-Neume files", "main": "server.js", "license": "MIT",