Fix ooui downloadImage callback
Signed-off-by: Justin Georgi <justin.georgi@gmail.com>
This commit is contained in:
@@ -99,7 +99,7 @@ class GlModelTransformOutput extends MediaTransformOutput {
|
|||||||
} else {
|
} else {
|
||||||
$annotations = $metadata['annotations'];
|
$annotations = $metadata['annotations'];
|
||||||
}
|
}
|
||||||
foreach($annotations as $label => $an) {
|
foreach($annotations as $label => $an) {
|
||||||
$elAnnot = Html::rawElement('div',['class' => 'HotspotAnnotation HiddenAnnotation'],$label);
|
$elAnnot = Html::rawElement('div',['class' => 'HotspotAnnotation HiddenAnnotation'],$label);
|
||||||
$hsDefault = array(
|
$hsDefault = array(
|
||||||
'class' => 'Hotspot awaiting-model',
|
'class' => 'Hotspot awaiting-model',
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
//Annotation Edit Controls
|
||||||
const addHS = new OO.ui.ButtonWidget({
|
const addHS = new OO.ui.ButtonWidget({
|
||||||
icon: 'mapPinAdd',
|
icon: 'mapPinAdd',
|
||||||
label: 'Add annotation',
|
label: 'Add annotation',
|
||||||
@@ -6,7 +7,6 @@ const addHS = new OO.ui.ButtonWidget({
|
|||||||
})
|
})
|
||||||
addHS.on('click', readyAddHotspot)
|
addHS.on('click', readyAddHotspot)
|
||||||
addHS.setDisabled(true)
|
addHS.setDisabled(true)
|
||||||
console.log(addHS)
|
|
||||||
|
|
||||||
const updateHS = new OO.ui.ButtonWidget({
|
const updateHS = new OO.ui.ButtonWidget({
|
||||||
icon: 'reload',
|
icon: 'reload',
|
||||||
@@ -24,18 +24,18 @@ const deleteHS = new OO.ui.ButtonWidget({
|
|||||||
deleteHS.on('click', readyDelHotspot)
|
deleteHS.on('click', readyDelHotspot)
|
||||||
deleteHS.setDisabled(true)
|
deleteHS.setDisabled(true)
|
||||||
|
|
||||||
const hotspotButtons = new OO.ui.ButtonGroupWidget( {
|
const hotspotButtons = new OO.ui.ButtonGroupWidget({
|
||||||
items: [ addHS, updateHS, deleteHS ]
|
items: [ addHS, updateHS, deleteHS ]
|
||||||
} );
|
})
|
||||||
console.log(hotspotButtons)
|
|
||||||
|
|
||||||
|
//View Edit Controls
|
||||||
const downloadViewerImage = new OO.ui.ButtonWidget({
|
const downloadViewerImage = new OO.ui.ButtonWidget({
|
||||||
icon: 'imageAdd',
|
icon: 'imageAdd',
|
||||||
label: 'Download current image',
|
label: 'Download current image',
|
||||||
invisibleLabel: true
|
invisibleLabel: true
|
||||||
})
|
})
|
||||||
downloadViewerImage.on('click', () => {
|
downloadViewerImage.on('click', () => {
|
||||||
downloadImage("TempTitle.glb")
|
downloadImage(mw.config.values.wgTitle)
|
||||||
})
|
})
|
||||||
downloadViewerImage.setDisabled(true)
|
downloadViewerImage.setDisabled(true)
|
||||||
|
|
||||||
@@ -47,19 +47,44 @@ const setView = new OO.ui.ButtonWidget({
|
|||||||
setView.on('click', writeCameraOrbit)
|
setView.on('click', writeCameraOrbit)
|
||||||
setView.setDisabled(true)
|
setView.setDisabled(true)
|
||||||
|
|
||||||
const cameraButtons = new OO.ui.ButtonGroupWidget( {
|
//View Limit Controls
|
||||||
items: [ downloadViewerImage, setView ]
|
const setMinYaw = new OO.ui.ButtonWidget({
|
||||||
} );
|
label: 'Yaw'
|
||||||
|
})
|
||||||
|
setMinYaw.on('click', () => {
|
||||||
|
limitCameraOrbit('yaw','min')
|
||||||
|
})
|
||||||
|
|
||||||
const modelMenu = new OO.ui.HorizontalLayout( {
|
const minLimitButtons = new OO.ui.ButtonGroupWidget({
|
||||||
|
items: [ setMinYaw ]
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
const setLims = new OO.ui.PopupButtonWidget({
|
||||||
|
label: 'Set View Limits',
|
||||||
|
icon: 'tableMergeCells',
|
||||||
|
popup: {
|
||||||
|
$content: $( '<p>Additional options here.</p>' ),
|
||||||
|
padded: true,
|
||||||
|
align: 'force-left'
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
const cameraButtons = new OO.ui.ButtonGroupWidget({
|
||||||
|
items: [ downloadViewerImage, setView ]
|
||||||
|
})
|
||||||
|
|
||||||
|
//Main Menu
|
||||||
|
const modelMenu = new OO.ui.HorizontalLayout({
|
||||||
items: [
|
items: [
|
||||||
hotspotButtons,
|
hotspotButtons,
|
||||||
cameraButtons
|
cameraButtons
|
||||||
],
|
],
|
||||||
id: 'edit-model-menu'
|
id: 'edit-model-menu'
|
||||||
});
|
})
|
||||||
|
|
||||||
$('#wikiPreview').after(modelMenu.$element);
|
$('#wikiPreview').after(modelMenu.$element)
|
||||||
|
|
||||||
enableMenu = function() {
|
enableMenu = function() {
|
||||||
modelMenu.items.forEach(group => {
|
modelMenu.items.forEach(group => {
|
||||||
|
|||||||
@@ -396,7 +396,7 @@ enableViewer = function() {
|
|||||||
* @param {string} defName wiki page name to use as base file name
|
* @param {string} defName wiki page name to use as base file name
|
||||||
*/
|
*/
|
||||||
downloadImage = function(defName) {
|
downloadImage = function(defName) {
|
||||||
const imgName = defName.substring(5).split('.')[0]
|
const imgName = defName.split('.')[0]
|
||||||
const mView = $('model-viewer')[0]
|
const mView = $('model-viewer')[0]
|
||||||
|
|
||||||
const dlA = document.createElement('a')
|
const dlA = document.createElement('a')
|
||||||
|
|||||||
Reference in New Issue
Block a user