Merge pull request pojala#5 from frankhale/master

Clean up JSBrowserWindowInstance constructor

Author: tht13

Electrino/win10/Electrino/JS/JSBrowserWindow.cs

@@ -38,33 +38,24 @@ protected override JavaScriptValue Main(JavaScriptValue callee, bool isConstruct
     class JSBrowserWindowInstance : AbstractJSModule
     {
         private JToken options;
-        // I don't really like putting this here, I think we should probably have a class that contains all our constants
-        private const int defaultWindowWidth = 800, defaultWindowHeight = 600;
         private Dictionary<string, List<Tuple<JavaScriptValue, JavaScriptValue>>> listeners = new Dictionary<string, List<Tuple<JavaScriptValue, JavaScriptValue>>>();
 
         public JSBrowserWindowInstance(JToken options) : base("BrowserWindowInstance")
         {
+            const int defaultWindowWidth = 800, defaultWindowHeight = 600;
+            int width = 0, height = 0;
             this.options = options;
 
             AttachMethod(LoadURL, "loadURL");
             AttachMethod(On, "on");
 
-            if (this.options != null)
-            {
-                int width = 0, height = 0;
-
-                Int32.TryParse(options["width"].ToString(), out width);
-                Int32.TryParse(options["height"].ToString(), out height);
+            Int32.TryParse(options["width"].ToString(), out width);
+            Int32.TryParse(options["height"].ToString(), out height);
 
-                if (width <= 0) width = defaultWindowWidth;
-                if (height <= 0) height = defaultWindowHeight;
+            if (width <= 0) width = defaultWindowWidth;
+            if (height <= 0) height = defaultWindowHeight;
 
-                App.NewWindow(width, height);
-            }
-            else
-            {
-                App.NewWindow(defaultWindowWidth, defaultWindowHeight);
-            }
+            App.NewWindow(width, height);
         }
         protected JavaScriptValue LoadURL(JavaScriptValue callee, bool isConstructCall, JavaScriptValue[] arguments, ushort argumentCount, IntPtr callbackData)
         {