From 2531876b13769600d9882585214a67c5843c8c26 Mon Sep 17 00:00:00 2001
From: John Chen <zhang.z.chen@intel.com>
Date: Fri, 31 Aug 2012 12:19:52 +0800
Subject: [PATCH 1/2] [Live View] Fix RIB-9: Not checking device size when
 rotating

---
 src/js/views/live.js | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/js/views/live.js b/src/js/views/live.js
index 195657f7..582bf9fd 100644
--- a/src/js/views/live.js
+++ b/src/js/views/live.js
@@ -17,7 +17,9 @@
 
         options: {
             iframe: null,
-            contentDocument: null
+            contentDocument: null,
+            maxDeviceSize: 10000,
+            minDeviceSize: 240,
         },
 
         _create: function() {
@@ -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);
                 },
@@ -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();

From eaac1af52a629cdd30973199a2c039a28265d430 Mon Sep 17 00:00:00 2001
From: John Chen <zhang.z.chen@intel.com>
Date: Fri, 31 Aug 2012 14:07:52 +0800
Subject: [PATCH 2/2] [Live View] Fix RIB-29 Height becomes floating number
 when adding device

---
 src/js/views/live.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/js/views/live.js b/src/js/views/live.js
index 582bf9fd..16c600fb 100644
--- a/src/js/views/live.js
+++ b/src/js/views/live.js
@@ -473,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;