Fixed an exception from being thrown when positioner is in iframe.

Fixed a regexp greediness bug.
toolness · Jan 12, 2012 · e2cac9d · e2cac9d
1 parent c16c70a
commit e2cac9d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/static-files/templates/positioner-demo-files/positioner.js b/static-files/templates/positioner-demo-files/positioner.js
@@ -117,8 +117,9 @@ var Positioner = (function(window) {
     function onMouseUp(event) {
       window.removeEventListener("mouseup", onMouseUp, false);
       window.removeEventListener("mousemove", onMouseMove, false);
-      window.history.pushState({}, "", "?" + makeQueryString() +
-                               window.location.hash);
+      if (window.parent === window)
+        window.history.pushState({}, "", "?" + makeQueryString() +
+                                 window.location.hash);
       event.preventDefault();
       inQuasimode = false;
     }
@@ -247,7 +248,7 @@ var Positioner = (function(window) {
       return '<style id="positioner-data">\n' + rules + '\n</style>';
     },
     addOrReplaceStyleHtmlToPage: function(html, rules) {
-      var styleRe = /\<style id="positioner-data"\>\n(?:.*\n)*\<\/style\>/m;
+      var styleRe = /\<style id="positioner-data"\>\n(?:.*\n)*?\<\/style\>/m;
       var styleMatch = html.match(styleRe);
       if (styleMatch)
         return html.replace(styleRe, utils.makeStyleHtml(rules));
@@ -258,7 +259,8 @@ var Positioner = (function(window) {
                "\n" + html.slice(titleCloseIndex);
       }
       return html + utils.makeStyleHtml(rules);
-    }
+    },
+    makeCssRules: makeCssRules
   };
 
   return {

diff --git a/static-files/templates/positioner-demo-files/test/index.html b/static-files/templates/positioner-demo-files/test/index.html
@@ -74,12 +74,12 @@ <h2 id="qunit-userAgent"></h2>
   var start = '<!DOCTYPE html>\n<meta charset="utf-8">\n' +
               '<title>My page</title>\n' +
               '<style id="positioner-data">\n#blah {}\n\n/**/\n</style>\n' +
-              '<p>blah</p>';
+              '<style>\n/* other stuff */\n</style>\n<p>blah</p>';
   var rules = '#NEWNEW {}';
   equals(Positioner.utils.addOrReplaceStyleHtmlToPage(start, rules),
          '<!DOCTYPE html>\n<meta charset="utf-8">\n' +
          '<title>My page</title>\n' +
          '<style id="positioner-data">\n#NEWNEW {}\n</style>\n' +
-         '<p>blah</p>');
+         '<style>\n/* other stuff */\n</style>\n<p>blah</p>');
 });
 </script>