Merge branch 'hotfix/2.1.3'

isotope · Jun 30, 2014 · ac049e2 · ac049e2
2 parents 4b96b55 + d6e5b16
commit ac049e2
Show file tree

Hide file tree

Showing 54 changed files with 401 additions and 152 deletions.
diff --git a/composer.json b/composer.json
@@ -16,8 +16,8 @@
     ],
     "require":{
         "php":">=5.3.2",
-        "contao/core":"~3.2.2",
-        "contao-community-alliance/composer-installer":"*",
+        "contao/core":">=3.2.2,<3.4",
+        "contao-community-alliance/composer-plugin":"2.*",
         "contao-legacy/conditionalselectmenu":"2.*",
         "contao-legacy/namespaceclassloader":">=1.0.1,<2.0",
         "terminal42/dcawizard":">=2.0.2,<3.0",
@@ -51,9 +51,6 @@
             "runonce": [
                 "system/modules/isotope/config/upgrade.php"
             ]
-        },
-        "branch-alias": {
-            "dev-release/2.1.0": "2.1.x-dev"
         }
     }
 }
diff --git a/system/modules/isotope/assets/css/backend.css b/system/modules/isotope/assets/css/backend.css
@@ -31,7 +31,7 @@
 
 .header_iso_copy
 {
-    background-image:url(../../../themes/default/images/copy.gif);
+    background-image:url(../../../../themes/default/images/copy.gif);
     background-position:left center;
     background-repeat:no-repeat;
     padding:2px 0 3px 20px;

diff --git a/system/modules/isotope/assets/css/backend.min.css b/system/modules/isotope/assets/css/backend.min.css
diff --git a/system/modules/isotope/assets/js/isotope.js b/system/modules/isotope/assets/js/isotope.js
@@ -1,3 +1,36 @@
+/**
+ * EventListener Polyfill for IE8
+ * @see https://gist.github.com/jonathantneal/3748027
+ */
+!window.addEventListener && (function (WindowPrototype, DocumentPrototype, ElementPrototype, addEventListener, removeEventListener, dispatchEvent, registry) {
+    WindowPrototype[addEventListener] = DocumentPrototype[addEventListener] = ElementPrototype[addEventListener] = function (type, listener) {
+        var target = this;
+
+        registry.unshift([target, type, listener, function (event) {
+            event.currentTarget = target;
+            event.preventDefault = function () { event.returnValue = false };
+            event.stopPropagation = function () { event.cancelBubble = true };
+            event.target = event.srcElement || target;
+
+            listener.call(target, event);
+        }]);
+
+        this.attachEvent("on" + type, registry[0][3]);
+    };
+
+    WindowPrototype[removeEventListener] = DocumentPrototype[removeEventListener] = ElementPrototype[removeEventListener] = function (type, listener) {
+        for (var index = 0, register; register = registry[index]; ++index) {
+            if (register[0] == this && register[1] == type && register[2] == listener) {
+                return this.detachEvent("on" + type, registry.splice(index, 1)[0][3]);
+            }
+        }
+    };
+
+    WindowPrototype[dispatchEvent] = DocumentPrototype[dispatchEvent] = ElementPrototype[dispatchEvent] = function (eventObject) {
+        return this.fireEvent("on" + eventObject.type, eventObject);
+    };
+})(Window.prototype, HTMLDocument.prototype, Element.prototype, "addEventListener", "removeEventListener", "dispatchEvent", []);
+
 /**
  * Isotope eCommerce for Contao Open Source CMS
  *

diff --git a/system/modules/isotope/assets/js/isotope.min.js b/system/modules/isotope/assets/js/isotope.min.js
diff --git a/system/modules/isotope/dca/tl_iso_product.php b/system/modules/isotope/dca/tl_iso_product.php
@@ -40,6 +40,7 @@
         'oncopy_callback' => array
         (
             array('Isotope\Backend\Product\Category', 'updateSorting'),
+            array('Isotope\Backend\Product\DcaManager', 'updateDateAdded'),
         ),
         'onsubmit_callback' => array
         (
@@ -309,7 +310,7 @@
             'label'                 => &$GLOBALS['TL_LANG']['tl_iso_product']['inherit'],
             'exclude'               => true,
             'inputType'             => 'inheritCheckbox',
-            'eval'                  => array('multiple'=>true, 'doNotShow'=>true),
+            'eval'                  => array('multiple'=>true),
             'attributes'            => array('systemColumn'=>true),
             'sql'                   => "blob NULL",
         ),