Skip to content
This repository was archived by the owner on Mar 14, 2020. It is now read-only.

[Live View] Fix RIB-9 and RIB29 #277

Closed
zhizhangchen wants to merge 2 commits into from
Closed

[Live View] Fix RIB-9 and RIB29 #277

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2531876
[Live View] Fix RIB-9: Not checking device size when rotating
zhizhangchen Aug 31, 2012
eaac1af
[Live View] Fix RIB-29 Height becomes floating number when adding device
zhizhangchen Aug 31, 2012
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
22 changes: 20 additions & 2 deletions src/js/views/live.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@

options: {
iframe: null,
contentDocument: null
contentDocument: null,
maxDeviceSize: 10000,
minDeviceSize: 240,
},

_create: function() {
Expand All @@ -31,7 +33,9 @@
rotateDeviceButton,
widget = this,
screenCoordElement = function (name, min, className) {
return $('<input type="number" min="240" max="10000" required/>')
return $('<input type="number" min="'
+ widget.options.minDeviceSize + '" max="'
+ widget.options.maxDeviceSize + '" required/>')
.attr("name", name)
.addClass(className);
},
Expand Down Expand Up @@ -273,6 +277,18 @@
.addClass("rotateDevice separated")
.appendTo(deviceToolbar)
.click( function () {
if (widget._screenWidth.val() < widget.options.minDeviceSize ||
widget._screenHeight.val() < widget.options.minDeviceSize) {
alert("Device size should not be less than "
+ widget.options.minDeviceSize);
return;
}
else if (widget._screenWidth.val() > widget.options.maxDeviceSize ||
widget._screenHeight.val() > widget.options.maxDeviceSize) {
alert("Device size should not be greater than "
+ widget.options.maxDeviceSize);
return;
}
widget._projectDevice.rotating = !widget._projectDevice.rotating;
widget._projectDevice.screenWidth = widget._screenHeight.val();
widget._projectDevice.screenHeight = widget._screenWidth.val();
Expand Down Expand Up @@ -457,9 +473,11 @@
var scaleW = screenWidth/deviceInfo.screen.width,
scaleH = screenHeight/deviceInfo.screen.height;
deviceInfo.screen.width *= scaleW;
deviceInfo.screen.width = Math.round(deviceInfo.screen.width);
deviceInfo.screen.offset.left *= scaleW;
deviceInfo.screen.offset.right *= scaleW;
deviceInfo.screen.height *= scaleH;
deviceInfo.screen.height = Math.round(deviceInfo.screen.height);
deviceInfo.screen.offset.top *= scaleH;
deviceInfo.screen.offset.bottom *= scaleH;

Expand Down