merge from master 1.10.1

henryyan · Apr 23, 2014 · 471ce54 · 471ce54
1 parent cfc020f
commit 471ce54
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 38 deletions.
diff --git a/WebContent/editor/oryx.debug.js b/WebContent/editor/oryx.debug.js
@@ -21,6 +21,22 @@
  * DEALINGS IN THE SOFTWARE.
  **/
 
+/**
+ * Fixed http://forums.activiti.org/content/activiti-modeler-doesnt-work-chrome-v34
+ */
+ if (!Document.prototype.createAttributeNS) {
+  Document.prototype.createAttributeNS = function(namespaceURI, qualifiedName) {
+    var dummy = this.createElement('dummy');
+    dummy.setAttributeNS(namespaceURI, qualifiedName, '');
+    var attr = dummy.attributes[0];
+    dummy.removeAttributeNode(attr);
+    return attr;
+  };
+}
+if (!Element.prototype.setAttributeNodeNS) {
+  Element.prototype.setAttributeNodeNS = Element.prototype.setAttributeNode;
+}
+
 /**
  * @namespace Oryx name space for different utility methods
  * @name ORYX.Utils
@@ -18218,43 +18234,43 @@ ORYX.Plugins.AbstractLayouter = ORYX.Plugins.AbstractPlugin.extend({
 	layout: function(shapes){
 		throw new Error("Layouter has to implement the layout function.")
 	}
-});ImageViewer = Ext.extend(Ext.Window, {
-    initComponent: function() {
-        this.bodyCfg = {
-            tag: 'img',
-            src: this.src,
-            autoscroll: true,
-            fixedcenter	: true
-        };
-        ImageViewer.superclass.initComponent.apply(this, arguments);
-    },
-
-    onRender: function() {
-        ImageViewer.superclass.onRender.apply(this, arguments);
-        this.body.on('load', this.onImageLoad, this, {single: true});
-    },
-
-    onImageLoad: function() {
-       // var h = this.getFrameHeight(),
-       // w = this.getFrameWidth();
-       // this.setSize(this.body.dom.offsetWidth + w, this.body.dom.offsetHeight + h);
-    },
-
-    setSrc: function(src) {
-        this.body.on('load', this.onImageLoad, this, {single: true});
-        //this.body.dom.style.width = this.body.dom.style.width = 'auto';
-        this.body.dom.src = src;
-    },
-
-    initEvents: function() {
-        ImageViewer.superclass.initEvents.apply(this, arguments);
-        if (this.resizer) {
-            this.resizer.preserveRatio = true;
-        }
-    }
-});if(!Signavio){ var Signavio = {} };
-	if (!Signavio.Core) { Signavio.Core = {} };
-	Signavio.Core.Version = "1.0";
+});ImageViewer = Ext.extend(Ext.Window, {
+    initComponent: function() {
+        this.bodyCfg = {
+            tag: 'img',
+            src: this.src,
+            autoscroll: true,
+            fixedcenter	: true
+        };
+        ImageViewer.superclass.initComponent.apply(this, arguments);
+    },
+
+    onRender: function() {
+        ImageViewer.superclass.onRender.apply(this, arguments);
+        this.body.on('load', this.onImageLoad, this, {single: true});
+    },
+
+    onImageLoad: function() {
+       // var h = this.getFrameHeight(),
+       // w = this.getFrameWidth();
+       // this.setSize(this.body.dom.offsetWidth + w, this.body.dom.offsetHeight + h);
+    },
+
+    setSrc: function(src) {
+        this.body.on('load', this.onImageLoad, this, {single: true});
+        //this.body.dom.style.width = this.body.dom.style.width = 'auto';
+        this.body.dom.src = src;
+    },
+
+    initEvents: function() {
+        ImageViewer.superclass.initEvents.apply(this, arguments);
+        if (this.resizer) {
+            this.resizer.preserveRatio = true;
+        }
+    }
+});if(!Signavio){ var Signavio = {} };
+	if (!Signavio.Core) { Signavio.Core = {} };
+	Signavio.Core.Version = "1.0";
 			/**
  * Copyright (c) 2009
  *

diff --git a/resources/application.properties b/resources/application.properties
@@ -24,7 +24,7 @@ dbcp.maxActive=20
 dbcp.maxIdle=10
 
 #versions
-system.version=1.10.0
+system.version=1.10.1
 spring.version=3.2.5.RELEASE
 hibernate.version=4.2.5.Final
 activiti.version=5.15.1-kft

diff --git a/resources/diagrams/leave-jpa/Archive.zip b/resources/diagrams/leave-jpa/Archive.zip