Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Ocr #424

Open
wants to merge 33 commits into
base: master
Choose a base branch
from
Open

Ocr #424

Changes from 2 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
dc92fef
Update README.md
atarix83 Dec 12, 2016
47b791e
Update README.md
atarix83 Dec 12, 2016
4e776c3
Added ocr branch files
atarix83 Dec 12, 2016
fd67963
modified README.md
atarix83 Dec 12, 2016
c6ac3fc
Update bower.json
atarix83 Dec 12, 2016
16a814e
Update bower.json
atarix83 Dec 12, 2016
ef76ff1
Update bower.json
atarix83 Dec 12, 2016
9e7cac1
Update README.md
atarix83 Dec 12, 2016
b351e8a
build updated
atarix83 Jan 4, 2017
6e5fa7e
Merge branch 'ocr' of https://github.com/4Science/universalviewer int…
atarix83 Jan 4, 2017
61303cf
build updated
atarix83 Jan 9, 2017
5ca8f6b
Hostname configurable in Gruntfile.js
atarix83 Feb 3, 2017
c917af4
Merge remote-tracking branch 'upstream/master' into ocr
atarix83 Feb 10, 2017
2c67bc6
Merge remote-tracking branch 'upstream/master' into ocr
atarix83 Feb 10, 2017
20b3874
Merge remote-tracking branch 'upstream/master' into ocr
atarix83 Feb 16, 2017
038d858
Gruntfile.js changed
atarix83 Feb 16, 2017
e72ba09
Merge branch 'master' of https://github.com/UniversalViewer/universal…
atarix83 Feb 16, 2017
4f798eb
Merge branch 'master' of https://github.com/UniversalViewer/universal…
atarix83 Apr 14, 2017
320ac92
Add logo image to footer
atarix83 Apr 18, 2017
c237a6c
Merge remote-tracking branch 'remotes/origin/master' into ocr
atarix83 Apr 18, 2017
9c9caaa
Merge remote-tracking branch 'remotes/origin/master' into ocr
atarix83 Apr 18, 2017
71adc43
Merge last commits
atarix83 Apr 18, 2017
85539fd
Add "contributed by" text to settings dialogue
atarix83 Apr 18, 2017
4c0b66f
Fix async image load issue
atarix83 Apr 18, 2017
f0f9d5b
Merge remote-tracking branch 'remotes/origin/logo' into ocr
atarix83 Apr 19, 2017
6fcc3b8
Merge remote-tracking branch 'remotes/origin/logo' into ocr
atarix83 Apr 19, 2017
631ee83
Add configuration parameter for more info website
atarix83 Apr 19, 2017
34751d8
Add logo and contributor information
atarix83 Apr 19, 2017
e38055e
Remove logo padding
atarix83 Apr 19, 2017
4c8a6ea
Update build
atarix83 Apr 19, 2017
b75b8b7
Fix position logo onLoad
atarix83 Apr 19, 2017
64c48a2
Merge remote-tracking branch 'remotes/origin/logo' into ocr
atarix83 Apr 19, 2017
77121ed
Update build
atarix83 Apr 19, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/extensions/uv-seadragon-extension/Extension.ts
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ import ISeadragonExtension = require("./ISeadragonExtension");
import IThumb = Manifold.IThumb;
import ITreeNode = Manifold.ITreeNode;
import LeftPanel = require("../../modules/uv-shared-module/LeftPanel");
import Metrics = require("../../modules/uv-shared-module/Metrics");
import {MetricType} from "../../modules/uv-shared-module/MetricType";
import MobileFooterPanel = require("../../modules/uv-osdmobilefooterpanel-module/MobileFooter");
import Mode = require("./Mode");
import MoreInfoDialogue = require("../../modules/uv-dialogues-module/MoreInfoDialogue");
@@ -76,7 +76,7 @@ class Extension extends BaseExtension implements ISeadragonExtension {
const that = this;

$.subscribe(BaseCommands.METRIC_CHANGED, () => {
if (this.metric === Metrics.MOBILE_LANDSCAPE) {
if (this.metric.toString() === MetricType.MOBILELANDSCAPE.toString()) {
var settings: ISettings = {};
settings.pagingEnabled = false;
this.updateSettings(settings);
@@ -144,7 +144,7 @@ class Extension extends BaseExtension implements ISeadragonExtension {
});

$.subscribe(BaseCommands.LEFTPANEL_COLLAPSE_FULL_START, (e) => {
if (this.metric !== Metrics.MOBILE_LANDSCAPE) {
if (this.metric.toString() !== MetricType.MOBILELANDSCAPE.toString()) {
Shell.$rightPanel.show();
}
});
12 changes: 12 additions & 0 deletions src/extensions/uv-seadragon-extension/config/en-GB.json
Original file line number Diff line number Diff line change
@@ -8,6 +8,18 @@
"headerPanelEnabled": true,
"leftPanelEnabled": true,
"limitLocales": false,
"metrics": [
{
"type": "mobilelandscape",
"minWidth": 0,
"maxWidth": 640
},
{
"type": "laptop",
"minWidth": 640,
"maxWidth": 100000
}
],
"multiSelectionMimeType": "application/zip",
"navigatorEnabled": true,
"openTemplate": "http://universalviewer.io?manifest={0}",
35 changes: 22 additions & 13 deletions src/lib/bundle.js

Large diffs are not rendered by default.

11 changes: 0 additions & 11 deletions src/lib/bundle.min.js

This file was deleted.

4 changes: 2 additions & 2 deletions src/modules/uv-contentleftpanel-module/ContentLeftPanel.ts
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ import ISeadragonExtension = require("../../extensions/uv-seadragon-extension/IS
import IThumb = Manifold.IThumb;
import ITreeNode = Manifold.ITreeNode;
import LeftPanel = require("../uv-shared-module/LeftPanel");
import Metrics = require("../uv-shared-module/Metrics");
import {MetricType} from "../uv-shared-module/MetricType";
import Mode = require("../../extensions/uv-seadragon-extension/Mode");
import MultiSelectState = Manifold.MultiSelectState;
import SearchResult = Manifold.SearchResult;
@@ -67,7 +67,7 @@ class ContentLeftPanel extends LeftPanel {
});

$.subscribe(BaseCommands.METRIC_CHANGED, () => {
if (this.extension.metric === Metrics.MOBILE_LANDSCAPE) {
if (this.extension.metric.toString() === MetricType.MOBILELANDSCAPE.toString()) {
if (this.isFullyExpanded) {
this.collapseFull();
}
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ import Commands = require("../../extensions/uv-seadragon-extension/Commands");
import CroppedImageDimensions = require("../../extensions/uv-seadragon-extension/CroppedImageDimensions");
import ExternalResource = Manifold.ExternalResource;
import ISeadragonExtension = require("../../extensions/uv-seadragon-extension/ISeadragonExtension");
import Metrics = require("../uv-shared-module/Metrics");
import {MetricType} from "../uv-shared-module/MetricType";
import Params = require("../../Params");
import Point = require("../../modules/uv-shared-module/Point");
import SearchResult = Manifold.SearchResult;
@@ -143,7 +143,7 @@ class SeadragonCenterPanel extends CenterPanel {
updateResponsiveView(): void {
this.setNavigatorVisible();

if (this.extension.metric === Metrics.MOBILE_LANDSCAPE) {
if (this.extension.metric.toString() === MetricType.MOBILELANDSCAPE.toString()) {
this.viewer.autoHideControls = false;
this.$viewportNavButtons.hide();
} else {
@@ -938,7 +938,7 @@ class SeadragonCenterPanel extends CenterPanel {
}

setNavigatorVisible(): void {
var navigatorEnabled = Utils.Bools.getBool(this.extension.getSettings().navigatorEnabled, true) && this.extension.metric !== Metrics.MOBILE_LANDSCAPE;
var navigatorEnabled = Utils.Bools.getBool(this.extension.getSettings().navigatorEnabled, true) && this.extension.metric.toString() !== MetricType.MOBILELANDSCAPE.toString();

this.viewer.navigator.setVisible(navigatorEnabled);

29 changes: 21 additions & 8 deletions src/modules/uv-shared-module/BaseExtension.ts
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ import IThumb = Manifold.IThumb;
import LoginDialogue = require("../../modules/uv-dialogues-module/#Dialogue");
import LoginWarningMessages = require("./#WarningMessages");
import Metric = require("../../modules/uv-shared-module/Metric");
import Metrics = require("../../modules/uv-shared-module/Metrics");
import {MetricType} from "../../modules/uv-shared-module/MetricType";
import Params = require("../../Params");
import RestrictedDialogue = require("../../modules/uv-dialogues-module/RestrictedDialogue");
import Shell = require("./Shell");
@@ -47,7 +47,8 @@ class BaseExtension implements IExtension {
locale: string;
locales: any[];
loginDialogue: LoginDialogue;
metric: Metric;
metric: MetricType = MetricType.LAPTOP;
metrics: Metric[] = [];
mouseX: number;
mouseY: number;
name: string;
@@ -86,6 +87,8 @@ class BaseExtension implements IExtension {
this.$element.width(this.embedWidth);
this.$element.height(this.embedHeight);

this._parseMetrics();

if (!this.isReload && Utils.Documents.isInIFrame()){
// communication with parent frame (if it exists).
this.bootstrapper.socket = new easyXDM.Socket({
@@ -669,16 +672,26 @@ class BaseExtension implements IExtension {
this.triggerSocket(BaseCommands.REFRESH, null);
}

private _updateMetric(): void {
private _parseMetrics(): void {
const metrics: any[] = this.config.options.metrics;

var keys: string[] = Object.keys(Metrics);
if (metrics) {
for (let i = 0; i < metrics.length; i++) {
const m: any = metrics[i];
m.type = new MetricType(m.type);
this.metrics.push(m);
}
}
}

private _updateMetric(): void {

for (var i = 0; i < keys.length; i++) {
var metric: Metric = Metrics[keys[i]];
for (let i = 0; i < this.metrics.length; i++) {
const metric: Metric = this.metrics[i];

if (this.width() > metric.minWidth && this.width() <= metric.maxWidth) {
if (this.metric !== metric) {
this.metric = metric;
if (this.metric !== metric.type) {
this.metric = metric.type;
$.publish(BaseCommands.METRIC_CHANGED);
}
}
6 changes: 3 additions & 3 deletions src/modules/uv-shared-module/FooterPanel.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import BaseCommands = require("./BaseCommands");
import BaseView = require("./BaseView");
import Metrics = require("./Metrics");
import {MetricType} from "./MetricType";

class FooterPanel extends BaseView {

@@ -120,7 +120,7 @@ class FooterPanel extends BaseView {
}

// otherwise, check metric
if (this.extension.metric === Metrics.MOBILE_LANDSCAPE) {
if (this.extension.metric.toString() === MetricType.MOBILELANDSCAPE.toString()) {
this.$options.addClass('minimiseButtons');
} else {
this.$options.removeClass('minimiseButtons');
@@ -130,7 +130,7 @@ class FooterPanel extends BaseView {
updateMoreInfoButton(): void {
var configEnabled = Utils.Bools.getBool(this.options.moreInfoEnabled, false);

if (configEnabled && this.extension.metric === Metrics.MOBILE_LANDSCAPE){
if (configEnabled && this.extension.metric.toString() === MetricType.MOBILELANDSCAPE.toString()){
this.$moreInfoButton.show();
} else {
this.$moreInfoButton.hide();
4 changes: 2 additions & 2 deletions src/modules/uv-shared-module/IExtension.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Bootstrapper = require("../../Bootstrapper");
import BootstrapParams = require("../../BootstrapParams");
import Metric = require("./Metric");
import {MetricType} from "./MetricType";
import Params = require("../../Params");

interface IExtension{
@@ -55,7 +55,7 @@ interface IExtension{
loadDependencies(deps: any): void;
locale: string;
locales: any[];
metric: Metric;
metric: MetricType;
mouseX: number;
mouseY: number;
name: string;
4 changes: 3 additions & 1 deletion src/modules/uv-shared-module/Metric.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import {MetricType} from "./MetricType";

class Metric {

constructor(public minWidth: number, public maxWidth: number) {
constructor(public type: MetricType, public minWidth: number, public maxWidth: number) {

}
}
6 changes: 6 additions & 0 deletions src/modules/uv-shared-module/MetricType.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import {StringValue} from "./StringValue";

export class MetricType extends StringValue {
public static MOBILELANDSCAPE = new MetricType("mobilelandscape");
public static LAPTOP = new MetricType("laptop");
}
8 changes: 0 additions & 8 deletions src/modules/uv-shared-module/Metrics.ts

This file was deleted.

13 changes: 13 additions & 0 deletions src/modules/uv-shared-module/StringValue.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
export class StringValue {
public value: string = "";

constructor(value?: string) {
if (value) {
this.value = value.toLowerCase();
}
}

toString() {
return this.value;
}
}
Loading