commit c79936c8e2688ded38dd860b5f45e4ae2f1399d3
parent 8bcde73443039c2aa1e456388f3ba92208be3dbc
Author: Felicitus <felicitus@felicitus.org>
Date: Sun, 3 Jan 2016 17:25:31 +0100
Merge branch 'PartKeepr-523'
Diffstat:
2 files changed, 173 insertions(+), 154 deletions(-)
diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Widgets/AttachmentGrid.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Widgets/AttachmentGrid.js
@@ -1,164 +1,188 @@
Ext.define('PartKeepr.AttachmentGrid', {
- extend: 'PartKeepr.BaseGrid',
- alias: 'widget.AttachmentGrid',
- border: false,
- model: null,
- initComponent: function () {
- this.store = Ext.create("Ext.data.Store", {
- model: this.model,
- proxy: {
- type: 'memory',
- reader: {
- type: 'json'
- }
- }
-
- });
-
- this.editing = Ext.create('Ext.grid.plugin.CellEditing', {
+ extend: 'PartKeepr.BaseGrid',
+ alias: 'widget.AttachmentGrid',
+ border: false,
+ model: null,
+ initComponent: function ()
+ {
+ this.store = Ext.create("Ext.data.Store", {
+ model: this.model,
+ proxy: {
+ type: 'memory',
+ reader: {
+ type: 'json'
+ }
+ }
+
+ });
+
+ this.editing = Ext.create('Ext.grid.plugin.CellEditing', {
clicksToEdit: 1
});
-
- this.plugins = [ this.editing ];
-
- this.deleteButton = Ext.create("Ext.button.Button", {
- text: i18n('Delete'),
- disabled: true,
- itemId: 'delete',
- scope: this,
- iconCls: 'web-icon delete',
- handler: this.onDeleteClick
- });
-
- this.viewButton = Ext.create("Ext.button.Button", {
- text: i18n("View"),
- handler: this.onViewClick,
- scope: this,
- iconCls: 'web-icon zoom',
- disabled: true
- });
-
- this.webcamButton = Ext.create("Ext.button.Button", {
- text: i18n("Take image"),
- handler: this.onWebcamClick,
- scope: this,
- iconCls: 'fugue-icon webcam'
- });
-
- this.dockedItems = [{
- xtype: 'toolbar',
- items: [{
- text: i18n('Add'),
- scope: this,
- iconCls: 'web-icon attach',
- handler: this.onAddClick
+
+ this.plugins = [this.editing];
+
+ this.deleteButton = Ext.create("Ext.button.Button", {
+ text: i18n('Delete'),
+ disabled: true,
+ itemId: 'delete',
+ scope: this,
+ iconCls: 'web-icon delete',
+ handler: this.onDeleteClick
+ });
+
+ this.viewButton = Ext.create("Ext.button.Button", {
+ text: i18n("View"),
+ handler: this.onViewClick,
+ scope: this,
+ iconCls: 'web-icon zoom',
+ disabled: true
+ });
+
+ this.webcamButton = Ext.create("Ext.button.Button", {
+ text: i18n("Take image"),
+ handler: this.onWebcamClick,
+ scope: this,
+ iconCls: 'fugue-icon webcam'
+ });
+
+ this.dockedItems = [
+ {
+ xtype: 'toolbar',
+ items: [
+ {
+ text: i18n('Add'),
+ scope: this,
+ iconCls: 'web-icon attach',
+ handler: this.onAddClick
+ },
+ this.webcamButton,
+ this.viewButton,
+ this.deleteButton
+ ]
+ }
+ ];
+
+ this.columns = [
+ {
+ dataIndex: 'extension',
+ width: 30,
+ renderer: function (value, metadata, record)
+ {
+ return '<img src="' + record.getId() + '/getMimeTypeIcon"/>';
+ }
+ },
+ {
+ header: i18n("Filename"),
+ dataIndex: 'originalFilename',
+ width: 200
},
- this.webcamButton,
- this.viewButton,
- this.deleteButton
+ {
+ header: i18n("Size"),
+ dataIndex: 'size',
+ width: 80,
+ renderer: PartKeepr.bytesToSize
+ },
+ {
+ header: i18n("Description"),
+ dataIndex: 'description',
+ flex: 0.4,
+ editor: {
+ xtype: 'textfield',
+ allowBlank: true
+ }
+ }
+ ];
+
+ this.callParent();
+
+ this.getSelectionModel().on('selectionchange', this.onSelectChange, this);
+ this.on("itemdblclick", this.onDoubleClick, this);
+ },
+ onWebcamClick: function ()
+ {
+ if (Ext.isIE) {
+ Ext.MessageBox.alert(i18n("Webcam not supported"),
+ i18n("Internet Explorer does not support HTML5 webcams"));
+ return;
+ }
+
+ var wp = Ext.create("PartKeepr.WebcamPanel");
+ wp.on("fileUploaded", this.onFileUploaded, this);
+
+ var j = Ext.create("Ext.window.Window", {
+ title: i18n("Take Webcam Photo"),
+ layout: 'fit',
+ items: [
+ wp
]
- }];
-
- this.columns = [
- {
- dataIndex: 'extension',
- width: 30,
- renderer: function (value, metadata, record) {
- return '<img src="'+record.getId()+'/getMimeTypeIcon"/>';
- }
- },
- {
- header: i18n("Filename"),
- dataIndex: 'originalFilename',
- width: 200
- },
- {
- header: i18n("Size"),
- dataIndex: 'size',
- width: 80,
- renderer: PartKeepr.bytesToSize
- },
- {
- header: i18n("Description"),
- dataIndex: 'description',
- flex: 0.4,
- editor: {
- xtype:'textfield',
- allowBlank:true
- }
- }
- ];
-
- this.callParent();
-
- this.getSelectionModel().on('selectionchange', this.onSelectChange, this);
- this.on("itemdblclick", this.onDoubleClick, this);
- },
- onWebcamClick: function () {
- var wp = Ext.create("PartKeepr.WebcamPanel");
- wp.on("fileUploaded", this.onFileUploaded, this);
-
- var j = Ext.create("Ext.window.Window", {
- title: i18n("Take Webcam Photo"),
- layout: 'fit',
- items: [
- wp
- ]
- });
-
- wp.on("fileUploaded", function () { j.close(); });
-
- j.show();
- },
- onDoubleClick: function (view, record) {
- if (record) {
- this.viewAttachment(record);
- }
- },
- onAddClick: function () {
- var j = Ext.create("PartKeepr.FileUploadDialog");
- j.on("fileUploaded", this.onFileUploaded, this);
- j.show();
- },
- onFileUploaded: function (response) {
- this.editing.cancelEdit();
-
- this.store.add(response);
-
- },
- onDeleteClick: function () {
- var selection = this.getView().getSelectionModel().getSelection()[0];
+ });
+
+ wp.on("fileUploaded", function ()
+ {
+ j.close();
+ });
+
+ j.show();
+ },
+ onDoubleClick: function (view, record)
+ {
+ if (record) {
+ this.viewAttachment(record);
+ }
+ },
+ onAddClick: function ()
+ {
+ var j = Ext.create("PartKeepr.FileUploadDialog");
+ j.on("fileUploaded", this.onFileUploaded, this);
+ j.show();
+ },
+ onFileUploaded: function (response)
+ {
+ this.editing.cancelEdit();
+
+ this.store.add(response);
+
+ },
+ onDeleteClick: function ()
+ {
+ var selection = this.getView().getSelectionModel().getSelection()[0];
if (selection) {
this.store.remove(selection);
}
- },
- onSelectChange: function(selModel, selections){
+ },
+ onSelectChange: function (selModel, selections)
+ {
this.deleteButton.setDisabled(selections.length === 0);
this.viewButton.setDisabled(selections.length === 0);
},
- onViewClick: function () {
- var selection = this.getView().getSelectionModel().getSelection()[0];
+ onViewClick: function ()
+ {
+ var selection = this.getView().getSelectionModel().getSelection()[0];
if (selection) {
- this.viewAttachment(selection);
+ this.viewAttachment(selection);
}
},
- viewAttachment: function (record) {
- var mySrc = record.getId() + "/getFile";
-
- new Ext.Window({
- title : i18n("Display File"),
- width : 640,
- height: 600,
- maximizable: true,
- constrain: true,
- layout : 'fit',
- items : [{
- xtype : "component",
- autoEl : {
- tag : "iframe",
- src : mySrc
- }
- }]
- }).show();
+ viewAttachment: function (record)
+ {
+ var mySrc = record.getId() + "/getFile";
+
+ new Ext.Window({
+ title: i18n("Display File"),
+ width: 640,
+ height: 600,
+ maximizable: true,
+ constrain: true,
+ layout: 'fit',
+ items: [
+ {
+ xtype: "component",
+ autoEl: {
+ tag: "iframe",
+ src: mySrc
+ }
+ }
+ ]
+ }).show();
}
});
diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Widgets/WebcamPanel.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Widgets/WebcamPanel.js
@@ -55,10 +55,6 @@ Ext.define('PartKeepr.WebcamPanel', {
// @todo: Implement video error handler
},
_onAfterRender: function () {
- if (Ext.isIE) {
- Ext.MessageBox.alert("Internet Explorer does not have webcam support.");
- return;
- }
this.video = this.down("#video").getEl().dom;
this.canvas = this.down("#canvas").getEl().dom;
@@ -114,4 +110,4 @@ Ext.define('PartKeepr.WebcamPanel', {
this.video.src=null;
}
-});-
\ No newline at end of file
+});
