Merge branch 'master' of github.com:Polymer/designer

Polymer · Apr 4, 2014 · d84f41e · d84f41e
2 parents 3338548 + ee61dc0
commit d84f41e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/elements/designer-element/designer-element.html b/elements/designer-element/designer-element.html
@@ -6,7 +6,7 @@
 
 <link rel="import" href="../x-dom-serializer/x-dom-serializer.html">
 
-<link rel="import" href="../x-inspector/x-inspector.html">
+<link rel="import" href="../x-inspector/x-inspector.html">
 <link rel="import" href="../x-file-document/x-file-document.html">
 
 <polymer-element name="designer-element">
@@ -73,7 +73,7 @@
     <section name="design">
       <polymer-flex-layout></polymer-flex-layout>
       <div id="frameContainer" flex>
-        <iframe id="frame" src="designer.html" on-load="{{designWindowLoaded}}"></iframe>
+        <iframe id="frame" src="designer.html"></iframe>
       </div>
       <x-inspector id="inspector" on-delete-element="{{deleteElement}}" on-parent-element="{{selectParentElement}}" on-bind-property="{{applyPropertyBinding}}"></x-inspector>
     </section>
@@ -100,6 +100,7 @@
     ready: function() {
       document.addEventListener('keydown', 
           this.KeydownAndPromptForUnload.bind(this, window));
+      window.addEventListener('message', this.designWindowLoaded.bind(this));
       this.firstLoad = true;
     },
 
@@ -206,7 +207,6 @@
     },
 
     reloadDesigner: function() {
-      //this.$.frame.onload = this.designWindowLoaded.bind(this);
       designWindow.location.reload();
     },
 

diff --git a/elements/designer-element/designer.html b/elements/designer-element/designer.html
@@ -1,10 +1,13 @@
 <!doctype html>
 <html>
 <head>
-
   <title>Polymer Designer</title>
 
   <script src="../../components/platform-dev/platform.js"></script>
+  <script>
+    window.parent.postMessage('designer-loading', location.href);
+  </script>
+
   <link rel="import" href="../x-designer/x-designer.html">
 
   <style>