Merge branch 'release/1.3.1_(1.0.0)'

yagiz · Jan 13, 2019 · 717da73 · 717da73
2 parents 66668ad + 37e5358
commit 717da73
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 56 deletions.
diff --git a/mac/Bagel.xcworkspace/xcuserdata/yagizgurgul.xcuserdatad/UserInterfaceState.xcuserstate b/mac/Bagel.xcworkspace/xcuserdata/yagizgurgul.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...Bagel.xcworkspace/xcuserdata/yagizgurgul.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/...Bagel.xcworkspace/xcuserdata/yagizgurgul.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -90,7 +90,7 @@
                   moduleName = "Bagel"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/yagizgurgul/Documents/Kuka/Projects/Baggle/iOS/BagelPublic/mac/Bagel/Components/Details/DetailSections/DataViewController/DataViewController.swift"
-                  timestampString = "569071500.9825799"
+                  timestampString = "569073489.486751"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "20"
@@ -105,7 +105,7 @@
                   moduleName = "Bagel"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/yagizgurgul/Documents/Kuka/Projects/Baggle/iOS/BagelPublic/mac/Bagel/Components/Details/DetailSections/DataViewController/DataViewController.swift"
-                  timestampString = "569071500.9847521"
+                  timestampString = "569073489.489041"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "20"
@@ -115,54 +115,6 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Bagel/Components/Details/DetailSections/DataViewController/DataJSONViewController/DataJSONViewController.swift"
-            timestampString = "569071438.091983"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "36"
-            endingLineNumber = "36"
-            landmarkName = "setup()"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "Bagel.DataJSONViewController.setup() -&gt; ()"
-                  moduleName = "Bagel"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/yagizgurgul/Documents/Kuka/Projects/Baggle/iOS/BagelPublic/mac/Bagel/Components/Details/DetailSections/DataViewController/DataJSONViewController/DataJSONViewController.swift"
-                  timestampString = "569071500.990683"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "37"
-                  endingLineNumber = "37"
-                  offsetFromSymbolStart = "743">
-               </Location>
-               <Location
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "closure #1 () -&gt; () in Bagel.DataJSONViewController.setup() -&gt; ()"
-                  moduleName = "Bagel"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/yagizgurgul/Documents/Kuka/Projects/Baggle/iOS/BagelPublic/mac/Bagel/Components/Details/DetailSections/DataViewController/DataJSONViewController/DataJSONViewController.swift"
-                  timestampString = "569071500.993139"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "37"
-                  endingLineNumber = "37"
-                  offsetFromSymbolStart = "33">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent

diff --git a/...ils/DetailSections/DataViewController/DataJSONViewController/DataJSONViewController.swift b/...ils/DetailSections/DataViewController/DataJSONViewController/DataJSONViewController.swift
@@ -11,7 +11,7 @@ import WebKit
 import macOSThemeKit
 
 class DataJSONViewController: BaseViewController {
-
+    
     var viewModel: DataJSONViewModel?
 
     var isRaw: Bool = false
@@ -56,9 +56,9 @@ class DataJSONViewController: BaseViewController {
         self.webView.mainFrame.load(htmlRequest)
         self.refreshJSONEditorTheme()
     }
-
+    
     func refresh() {
-
+        
         if self.isRaw {
 
             self.rawTextScrollView.isHidden = false
@@ -96,7 +96,7 @@ class DataJSONViewController: BaseViewController {
         }else if ThemeManager.shared.effectiveTheme === ThemeManager.darkTheme {
 
             self.webView.windowScriptObject.callWebScriptMethod("changeThemeToDark", withArguments: [])
-
+            
         }
     }
 
@@ -121,8 +121,10 @@ class DataJSONViewController: BaseViewController {
 extension DataJSONViewController: WebFrameLoadDelegate {
 
     func webView(_ sender: WebView!, didFinishLoadFor frame: WebFrame!) {
-        self.isWebViewLoaded = true
-        self.onWebViewDidFinishLoading?()
+        if self.isWebViewLoaded == false {
+            self.isWebViewLoaded = true
+            self.onWebViewDidFinishLoading?()
+        }
         self.refreshJSONEditorTheme()
     }
 }