Merge 610a15b into f2513b1

.travis.yml

@@ -1,8 +1,6 @@
 language: php
 
 php:
-  - 5.4
-  - 5.5
   - 5.6
 
 services:
@@ -14,7 +12,7 @@ before_install:
 
 before_script:
   - phpenv config-add travis/php.ini
-  - git clone -q --depth=1 https://github.com/phalcon/cphalcon.git -b master
+  - git clone -q --depth=1 https://github.com/phalcon/cphalcon.git -b phalcon-v2.0.8
   - (cd cphalcon/ext; export CFLAGS="-g3 -O1 -fno-delete-null-pointer-checks -Wall"; phpize && ./configure --enable-phalcon && make -j4 && sudo make install && phpenv config-add ../unit-tests/ci/phalcon.ini)
   - curl -s http://getcomposer.org/installer | php
   - php composer.phar install --dev

assets/js/lib/vegas/ui/cloneable.js

@@ -15,6 +15,7 @@
 
             preparedField.find('[name]').each(function() {
                 var orginalName = $(this).attr('name');
+                var orginalId = $(this).attr('id');
 
                 var nameArray = orginalName.split('[');
                 var baseName = nameArray.shift();
@@ -26,6 +27,12 @@
                     nameArray[0] = parseInt(nameArray[0])+rowCounter;
                 }
 
+                if(orginalId) {
+                    var idValueArr = orginalId.split(']');
+                    var idValue = idValueArr.slice(-1).pop();
+                    var newNameValue = baseName + '[' + nameArray.join(']') + idValue;
+                }
+
                 var newName = baseName + '[' + nameArray.join(']');
 
                 preparedField.find('[name="'+orginalName+'"]').each(function() {
@@ -35,13 +42,21 @@
                 preparedField.find('[id="'+orginalName+'"]').each(function() {
                     $(this).attr('id',newName);
                 });
+
+                preparedField.find('[id="'+orginalId+'"]').each(function() {
+                    $(this).attr('id',newNameValue);
+                });
+
+                preparedField.find('[for="'+orginalId+'"]').each(function() {
+                    $(this).attr('for',newNameValue);
+                });
             });
 
             return preparedField.show();
         };
 
         self.sortable = function(cloneContainer, options) {
-            if ($.fn.sortable) {
+            if ($.fn.sortable && options.sortable.active) {
                 cloneContainer.sortable({
                     forcePlaceholderSize: true,
                     items: ':visible'
@@ -68,6 +83,7 @@
                         .addClass('cloner-row-remove')
                 },
                 'sortable': {
+                    'active': false,
                     'callback': function() {
                         var orderIndicator = 0;