From b1268c527d1440f1ce8a1b94cacfa88b066eba78 Mon Sep 17 00:00:00 2001 From: Alexis Deveria Date: Mon, 20 Sep 2010 12:49:36 +0000 Subject: [PATCH] Fixed issue 678 - opensave extension broken git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1731 eee81c28-f429-11dd-99c0-75d572ba1ddd --- editor/svg-editor.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/editor/svg-editor.js b/editor/svg-editor.js index 68540a84..7dc1d9b5 100644 --- a/editor/svg-editor.js +++ b/editor/svg-editor.js @@ -227,9 +227,9 @@ } // Load extensions - // Bit of a hack to run extensions in local Opera - if(window.opera && document.location.protocol === 'file:') { - setTimeout(extFunc, 1000); + // Bit of a hack to run extensions in local Opera/IE9 + if(document.location.protocol === 'file:') { + setTimeout(extFunc, 100); } else { extFunc(); } @@ -4144,8 +4144,11 @@ Editor.addExtension = function() { var args = arguments; - Editor.ready(function() { - svgCanvas.addExtension.apply(this, args); + + // Note that we don't want this on Editor.ready since some extensions + // may want to run before then (like server_opensave). + $(function() { + if(svgCanvas) svgCanvas.addExtension.apply(this, args); }); };