Skip to content

Commit 85dc411

Browse files
gnujavasergiognujavasergio
committed
HTML 5 player video function
fix #219
1 parent c019f41 commit 85dc411

File tree

410 files changed

+10835
-3118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

410 files changed

+10835
-3118
lines changed

‎src/main/java/com/openkm/bean/Document.java

-10
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ public class Document extends Node {
5454
private LockInfo lockInfo;
5555
private boolean signed;
5656
private boolean convertibleToPdf;
57-
private boolean convertibleToSwf;
5857
private String cipherName;
5958

6059
public LockInfo getLockInfo() {
@@ -137,14 +136,6 @@ public void setConvertibleToPdf(boolean convertibleToPdf) {
137136
this.convertibleToPdf = convertibleToPdf;
138137
}
139138

140-
public boolean isConvertibleToSwf() {
141-
return convertibleToSwf;
142-
}
143-
144-
public void setConvertibleToSwf(boolean convertibleToSwf) {
145-
this.convertibleToSwf = convertibleToSwf;
146-
}
147-
148139
public void setCipherName(String cipherName) {
149140
this.cipherName = cipherName;
150141
}
@@ -182,7 +173,6 @@ public String toString() {
182173
sb.append(", subscriptors=").append(subscriptors);
183174
sb.append(", uuid=").append(uuid);
184175
sb.append(", convertibleToPdf=").append(convertibleToPdf);
185-
sb.append(", convertibleToSwf=").append(convertibleToSwf);
186176
sb.append(", cipherName=").append(cipherName);
187177
sb.append(", notes=").append(notes);
188178
sb.append(", language=").append(language);

‎src/main/java/com/openkm/core/Config.java

-7
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ public class Config {
102102
public static String REPOSITORY_CACHE_DIRNAME = "cache";
103103
public static String REPOSITORY_CACHE_DXF;
104104
public static String REPOSITORY_CACHE_PDF;
105-
public static String REPOSITORY_CACHE_SWF;
106105

107106
// Experimental features
108107
public static final String PROPERTY_PLUGIN_DEBUG = "plugin.debug";
@@ -221,7 +220,6 @@ public class Config {
221220
public static final String PROPERTY_SYSTEM_OPENOFFICE_PROGRAM = "system.openoffice.program";
222221
public static final String PROPERTY_SYSTEM_OPENOFFICE_DICTIONARY = "system.openoffice.dictionary";
223222
public static final String PROPERTY_SYSTEM_IMAGEMAGICK_CONVERT = "system.imagemagick.convert";
224-
public static final String PROPERTY_SYSTEM_SWFTOOLS_PDF2SWF = "system.swftools.pdf2swf";
225223
public static final String PROPERTY_SYSTEM_GHOSTSCRIPT = "system.ghostscript";
226224
public static final String PROPERTY_SYSTEM_DWG2DXF = "system.dwg2dxf";
227225
public static final String PROPERTY_SYSTEM_ANTIVIR = "system.antivir";
@@ -486,7 +484,6 @@ public class Config {
486484
public static String SYSTEM_OPENOFFICE_PROGRAM = "";
487485
public static String SYSTEM_OPENOFFICE_DICTIONARY = "";
488486
public static String SYSTEM_IMAGEMAGICK_CONVERT = "";
489-
public static String SYSTEM_SWFTOOLS_PDF2SWF = "";
490487
public static String SYSTEM_GHOSTSCRIPT = "";
491488
public static String SYSTEM_DWG2DXF = "";
492489
public static String SYSTEM_ANTIVIR = "";
@@ -732,8 +729,6 @@ public static Properties load(ServletContext sc) {
732729
values.put("repository.cache.dxf", REPOSITORY_CACHE_DXF);
733730
REPOSITORY_CACHE_PDF = REPOSITORY_CACHE_HOME + File.separator + "pdf";
734731
values.put("repository.cache.pdf", REPOSITORY_CACHE_PDF);
735-
REPOSITORY_CACHE_SWF = REPOSITORY_CACHE_HOME + File.separator + "swf";
736-
values.put("repository.cache.swf", REPOSITORY_CACHE_SWF);
737732
values.put(PROPERTY_HIBERNATE_SEARCH_INDEX_HOME, HIBERNATE_SEARCH_INDEX_HOME);
738733
values.put(PROPERTY_REPOSITORY_DATASTORE_BACKEND, REPOSITORY_DATASTORE_BACKEND);
739734
values.put(PROPERTY_REPOSITORY_DATASTORE_HOME, REPOSITORY_DATASTORE_HOME);
@@ -967,8 +962,6 @@ public static void reload(ServletContext sc, Properties cfg) {
967962
values.put(PROPERTY_SYSTEM_PDF_FORCE_OCR, Boolean.toString(SYSTEM_PDF_FORCE_OCR));
968963
SYSTEM_IMAGEMAGICK_CONVERT = ConfigDAO.getString(PROPERTY_SYSTEM_IMAGEMAGICK_CONVERT, cfg.getProperty(PROPERTY_SYSTEM_IMAGEMAGICK_CONVERT, EnvironmentDetector.detectImagemagickConvert()));
969964
values.put(PROPERTY_SYSTEM_IMAGEMAGICK_CONVERT, SYSTEM_IMAGEMAGICK_CONVERT);
970-
SYSTEM_SWFTOOLS_PDF2SWF = ConfigDAO.getString(PROPERTY_SYSTEM_SWFTOOLS_PDF2SWF, cfg.getProperty(PROPERTY_SYSTEM_SWFTOOLS_PDF2SWF, EnvironmentDetector.detectSwftoolsPdf2Swf()));
971-
values.put(PROPERTY_SYSTEM_SWFTOOLS_PDF2SWF, SYSTEM_SWFTOOLS_PDF2SWF);
972965
SYSTEM_GHOSTSCRIPT = ConfigDAO.getString(PROPERTY_SYSTEM_GHOSTSCRIPT, cfg.getProperty(PROPERTY_SYSTEM_GHOSTSCRIPT, EnvironmentDetector.detectGhostscript()));
973966
values.put(PROPERTY_SYSTEM_GHOSTSCRIPT, SYSTEM_GHOSTSCRIPT);
974967
SYSTEM_DWG2DXF = ConfigDAO.getString(PROPERTY_SYSTEM_DWG2DXF, cfg.getProperty(PROPERTY_SYSTEM_DWG2DXF, ""));

‎src/main/java/com/openkm/core/MimeTypeConfig.java

+29-8
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ public class MimeTypeConfig {
3434

3535
// MIME types => NOTE Keep on sync with default.sql
3636
public final static String MIME_UNDEFINED = "application/octet-stream";
37+
38+
// application
3739
public final static String MIME_RTF = "application/rtf";
3840
public final static String MIME_PDF = "application/pdf";
3941
public final static String MIME_ZIP = "application/zip";
@@ -48,6 +50,9 @@ public class MimeTypeConfig {
4850
public final static String MIME_OO_SPREADSHEET = "application/vnd.oasis.opendocument.spreadsheet";
4951
public final static String MIME_OO_PRESENTATION = "application/vnd.oasis.opendocument.presentation";
5052
public final static String MIME_SWF = "application/x-shockwave-flash";
53+
public final static String MIME_JAR = "application/x-java-archive";
54+
55+
// Image
5156
public final static String MIME_DXF = "image/vnd.dxf";
5257
public final static String MIME_DWG = "image/vnd.dwg";
5358
public final static String MIME_TIFF = "image/tiff";
@@ -57,28 +62,44 @@ public class MimeTypeConfig {
5762
public final static String MIME_BMP = "image/bmp";
5863
public final static String MIME_PSD = "image/x-psd";
5964
public final static String MIME_ICO = "image/x-ico";
65+
public final static String MIME_PBM = "image/pbm";
66+
public final static String MIME_SVG = "image/svg+xml";
67+
68+
// Video
69+
public final static String MIME_MP3 = "audio/mpeg";
70+
public final static String MIME_WAV = "audio/x-wav";
71+
public final static String MIME_MP4 = "video/mp4";
72+
public final static String MIME_MPEG = "video/mpeg";
73+
public final static String MIME_FLV = "video/x-flv";
74+
public final static String MIME_WMV = "video/x-ms-wmv";
75+
public final static String MIME_AVI = "video/x-msvideo";
76+
77+
// Text
6078
public final static String MIME_HTML = "text/html";
6179
public final static String MIME_TEXT = "text/plain";
6280
public final static String MIME_XML = "text/xml";
6381
public final static String MIME_CSV = "text/csv";
82+
public final static String MIME_CSS = "text/css";
83+
84+
// Language
6485
public final static String MIME_SQL = "text/x-sql";
6586
public final static String MIME_JAVA = "text/x-java";
66-
public final static String MIME_JAR = "application/x-java-archive";
67-
public final static String MIME_SH = "application/x-shellscript";
68-
public final static String MIME_BSH = "application/x-bsh";
69-
public final static String MIME_PHP = "application/x-php";
7087
public final static String MIME_SCALA = "text/x-scala";
7188
public final static String MIME_PYTHON = "text/x-python";
72-
public final static String MIME_PERL = "application/x-perl";
73-
public final static String MIME_JAVASCRIPT = "application/javascript";
7489
public final static String MIME_GROOVY = "text/x-groovy";
7590
public final static String MIME_DIFF = "text/x-diff";
7691
public final static String MIME_PASCAL = "text/x-pascal";
77-
public final static String MIME_CSS = "text/css";
7892
public final static String MIME_CSHARP = "text/x-csharp";
7993
public final static String MIME_CPP = "text/x-c++";
80-
public final static String MIME_AS3 = "application/x-font-truetype";
8194
public final static String MIME_APPLESCRIPT = "text/applescript";
95+
public final static String MIME_SH = "application/x-shellscript";
96+
public final static String MIME_BSH = "application/x-bsh";
97+
public final static String MIME_PHP = "application/x-php";
98+
public final static String MIME_PERL = "application/x-perl";
99+
public final static String MIME_JAVASCRIPT = "application/javascript";
100+
public final static String MIME_AS3 = "application/x-font-truetype";
101+
102+
// Mail
82103
public final static String MIME_EML = "message/rfc822";
83104

84105
//public final static String MIME_VB = "";

‎src/main/java/com/openkm/dao/bean/AutomationRule.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public class AutomationRule implements Serializable {
5151
public static final String EVENT_TEXT_EXTRACTOR = "text_extractor";
5252

5353
public static final String EVENT_CONVERSION_PDF = "convert_pdf";
54-
public static final String EVENT_CONVERSION_SWF = "convert_swf";
5554

5655
public static final String EVENT_PROPERTY_GROUP_ADD = "prop_group_add";
5756
public static final String EVENT_PROPERTY_GROUP_SET = "prop_group_set";
@@ -81,13 +80,12 @@ public class AutomationRule implements Serializable {
8180
put(AutomationRule.EVENT_TEXT_EXTRACTOR, "Text extraction");
8281

8382
put(AutomationRule.EVENT_CONVERSION_PDF, "Convert to PDF");
84-
put(AutomationRule.EVENT_CONVERSION_SWF, "Convert to SWF");
8583

8684
put(AutomationRule.EVENT_USER_LOGIN, "User login");
8785
put(AutomationRule.EVENT_USER_LOGOUT, "User logout");
8886
}
8987
};
90-
88+
9189
@Id
9290
@Column(name = "ARL_ID")
9391
@GeneratedValue(strategy = GenerationType.AUTO)

‎src/main/java/com/openkm/frontend/client/bean/GWTConverterStatus.java

-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ public class GWTConverterStatus implements IsSerializable {
3232
public static final int STATUS_LOADING = 1;
3333
public static final int STATUS_CONVERTING_TO_PDF = 2;
3434
public static final int STATUS_CONVERTING_TO_PDF_FINISHED = 3;
35-
public static final int STATUS_CONVERTING_TO_SWF = 4;
36-
public static final int STATUS_CONVERTING_TO_SWF_FINISHED = 5;
3735
public static final int STATUS_SENDING_FILE = 6;
3836

3937
private int status = STATUS_LOADING;

‎src/main/java/com/openkm/frontend/client/extension/widget/preview/PreviewExtension.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,21 @@
2323

2424
import com.google.gwt.user.client.ui.Composite;
2525
import com.google.gwt.user.client.ui.Widget;
26+
import com.openkm.frontend.client.bean.GWTDocument;
2627

2728
/**
2829
* TabDocumentExtension
2930
*
3031
* @author jllort
3132
*/
3233
public abstract class PreviewExtension extends Composite implements HasPreviewExtension {
33-
public abstract void createViewer(String url, int width, int height);
34+
public abstract void createViewer(GWTDocument doc, String url, int width, int height);
3435

3536
public abstract Widget getWidget();
3637

3738
public abstract void setVisible(boolean visible);
3839

3940
public abstract void resizeViewer(int width, int height);
40-
}
41+
42+
public abstract boolean isPreviewAvailable(String mimeType);
43+
}

‎src/main/java/com/openkm/frontend/client/util/ConversionStatus.java

+1-7
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,6 @@ public void onSuccess(GWTConverterStatus result) {
6161
case GWTConverterStatus.STATUS_CONVERTING_TO_PDF_FINISHED:
6262
Main.get().mainPanel.bottomPanel.setStatus(Main.i18n("status.converter.topdf.finished"));
6363
break;
64-
case GWTConverterStatus.STATUS_CONVERTING_TO_SWF:
65-
Main.get().mainPanel.bottomPanel.setStatus(Main.i18n("status.converter.toswf"));
66-
break;
67-
case GWTConverterStatus.STATUS_CONVERTING_TO_SWF_FINISHED:
68-
Main.get().mainPanel.bottomPanel.setStatus(Main.i18n("status.converter.toswf.finished"));
69-
break;
7064
case GWTConverterStatus.STATUS_SENDING_FILE:
7165
Main.get().mainPanel.bottomPanel.setStatus(Main.i18n("status.converter.sending.file"));
7266
break;
@@ -99,4 +93,4 @@ public void run() {
9993

10094
refreshStatus.schedule(REFRESH_STATUS_DELAY);
10195
}
102-
}
96+
}

‎src/main/java/com/openkm/frontend/client/util/Util.java

+6-76
Original file line numberDiff line numberDiff line change
@@ -574,83 +574,13 @@ public static native String getUserAgent() /*-{
574574
}
575575
}-*/;
576576

577-
public static native void removeMediaPlayer() /*-{
578-
$wnd.swfobject.removeSWF("jsmediaplayer");
579-
}-*/;
580-
581-
public static native void createMediaPlayer(String mediaUrl, String mediaProvider, String width, String height) /*-{
582-
$wnd.swfobject.embedSWF("../js/mediaplayer/player.swf", "mediaplayercontainer", width, height, "9.0.0", "../js/mediaplayer/expressinstall.swf", {
583-
file: mediaUrl,
584-
provider: mediaProvider,
585-
autostart: "true",
586-
width: width,
587-
height: height
588-
}, {allowscriptaccess: "always", allowfullscreen: "true"}, {id: "jsmediaplayer", name: "jsmediaplayer"});
589-
}-*/;
590-
591-
public static native void resizeMediaPlayer(String width, String height) /*-{
592-
obj = $wnd.swfobject.getObjectById('jsmediaplayer');
593-
obj.width = width;
594-
obj.height = height;
595-
}-*/;
596-
597-
public static native void createSwfViewer(String swfUrl, String width, String height) /*-{
598-
$wnd.swfobject.embedSWF(swfUrl, "swfviewercontainer", width, height, "9.0.0", "../js/mediaplayer/expressinstall.swf", {
599-
width: width,
600-
height: height
601-
}, {}, {id: "jswfviewer", name: "jswfviewer"});
602-
}-*/;
603-
604-
public static native void resizeSwfViewer(String width, String height) /*-{
605-
obj = $wnd.swfobject.getObjectById('jswfviewer');
606-
obj.width = width;
607-
obj.height = height;
608-
}-*/;
609-
610-
public static native void createPDFViewerFlexPaper(String pdfUrl, String width, String height) /*-{
611-
fpViewer = "../js/flexpaper/FlexPaperViewer.swf";
612-
pdfUrl = encodeURIComponent(pdfUrl);
613-
$wnd.swfobject.embedSWF(fpViewer, "pdfviewercontainer", width, height, "10.0.0", "playerProductInstall.swf",
614-
{
615-
SwfFile: pdfUrl,
616-
Scale: 0.6,
617-
ZoomTransition: "easeOut",
618-
ZoomTime: 0.5,
619-
ZoomInterval: 0.1,
620-
FitPageOnLoad: false,
621-
FitWidthOnLoad: true,
622-
FullScreenAsMaxWindow: false,
623-
ProgressiveLoading: true,
624-
ViewModeToolsVisible: true,
625-
ZoomToolsVisible: true,
626-
FullScreenVisible: true,
627-
NavToolsVisible: true,
628-
CursorToolsVisible: true,
629-
SearchToolsVisible: true,
630-
localeChain: "en_US"
631-
},
632-
{
633-
quality: "high",
634-
bgcolor: "#ffffff",
635-
allowscriptaccess: "sameDomain",
636-
allowfullscreen: "true"
637-
},
638-
{
639-
id: "FlexPaperViewer",
640-
name: "FlexPaperViewer"
641-
});
642-
}-*/;
643-
644-
public static native void resizePDFViewerFlexPaper(String width, String height) /*-{
645-
obj = $wnd.swfobject.getObjectById('FlexPaperViewer');
646-
obj.width = width;
647-
obj.height = height;
648-
}-*/;
649-
650577
public static native void resizeEmbededPDF(String width, String height, String pdfId) /*-{
651-
obj = $wnd.document.getElementById(pdfId);
652-
obj.width = width;
653-
obj.height = height;
578+
obj = $wnd.document.getElementById(pdfId);
579+
// Take in consideration if object exists
580+
if (obj != null) {
581+
obj.width = width;
582+
obj.height = height;
583+
}
654584
}-*/;
655585

656586
public static native void copyToClipboard(String text) /*-{

‎src/main/java/com/openkm/frontend/client/widget/properties/EmbeddedPreview.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public EmbeddedPreview() {
6464
* show
6565
*/
6666
public void showEmbedded(String url) {
67-
iframe.setUrl(Main.CONTEXT + "/preview/pdfjs/web/viewer.html?" + url);
67+
iframe.setUrl(Main.CONTEXT + "/Preview?" + url);
6868
}
6969

7070
/**

‎src/main/java/com/openkm/frontend/client/widget/properties/HTMLPreview.java

-75
This file was deleted.

0 commit comments

Comments
 (0)