forge-cli 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16721f143f0e604495334b8a0328f7ebbd7ba313
-  data.tar.gz: f934a88b7e53918deff60fdacabcf75e96e6757c
+  metadata.gz: eb034dc7596b2cf13168ae5f7d8f504e54d8fcbc
+  data.tar.gz: 0f73b2c8c982284f5533553d4fc3b8b0e2c84979
 SHA512:
-  metadata.gz: 7d779b0f9d3ffc0594ffcbeb93a451f95d2a27299b9045de51907ea95d86c8c0aeb1d582d7b421188fdb433001cc34a679004f3f845cdba63f5ad6162d92cb9d
-  data.tar.gz: c5e889439dcecb7aafc4e25fae58f57b1e865512a98692b0178cc40a37b19e319a71d822769dbd741d752546b816c081993402b98db02973a14eded0d5effeda
+  metadata.gz: 62a94b3ae2dffef6811e27390027e061cf1cefc9515f35bcf3640269a811d73479394ae1dc0d254d144473811f42548e257586b6ff360ad22abcf66fcc21c089
+  data.tar.gz: 8f98b94286c1eef77d657d89a8b185585238ebc7463ec8cdf3bd1b9d9e1438a95cb7b8bd5bb166613eb4317ad0ce1f828ab5b2f78b03fa2223b9cf19f6fdc40a

data/lib/forge-cli/version.rb

@@ -1,3 +1,3 @@
 class ForgeCLI
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

data/lib/forge/app/views/forge/galleries/_form.html.haml

@@ -1,7 +1,12 @@
 - content_for :scripts do
   :javascript
     $(function() {
-      FORGE.features.nestedFields.init('#photos', {after: function() { FORGE.features.nestedFields.reorganize(4, '#photos-list li'); }});
+      FORGE.features.nestedFields.init('#photos', {
+        after: function() {
+          FORGE.features.nestedFields.reorganize(4, '#photos-list li');
+          FORGE.features.nestedFields.setListOrder('#photos-list li');
+        }
+      });
       FORGE.features.nestedFields.reorganize(4, '#photos-list li');
     });
 

data/lib/forge/lib/assets/javascripts/forge/features/nested_fields.js

@@ -1,15 +1,15 @@
 FORGE.features.nestedFields = {
   config: {
     sortable: {
-      
+
     }
   },
-  
+
   init: function (container, options) {
     var self = FORGE.features.nestedFields,
         $container = $(container);
     $.extend(self.config, options);
-    
+
     $container
       .on('click', 'a.add_child', self.addChild)
       .on('click', 'a.remove_child', self.removeChild)
@@ -25,7 +25,7 @@ FORGE.features.nestedFields = {
         }
       });
   },
-  
+
   addChild: function (e) {
     e.preventDefault();
     var self     = FORGE.features.nestedFields,
@@ -34,11 +34,11 @@ FORGE.features.nestedFields = {
         regexp   = new RegExp('new_' + assoc, 'g'),
         new_id   = new Date().getTime(),
         $list    = $('#'+assoc+'-list');
-    
+
     self.runCallback(self.config.before);
-    
+
     $list.append(content.replace(regexp, new_id));
-    
+
     // Maintain the same value as the last select box
     if (content.match(/<select/)) {
       var length = $list.find("select").length;
@@ -47,37 +47,49 @@ FORGE.features.nestedFields = {
     //$('input').hint();
     self.runCallback(self.config.after);
   },
-  
+
   removeChild: function () {
     var self        = FORGE.features.nestedFields,
         hiddenField = $(this).prev('input[name*=_destroy]')[0];
-    
-    if (confirm("Are you sure?")) {  
+
+    if (confirm("Are you sure?")) {
       // Existing records get set as deleted, new records just get cleared out of the DOM
       if(hiddenField) {
         hiddenField.value = 'true';
       }
-      
+
       $(this).closest('li').fadeOut('fast', function() {
         self.runCallback(self.config.after);
       });
-      
+
     }
     return false;
   },
-  
+
   runCallback: function (callback) {
     if (typeof(callback) !== 'undefined')
       callback.call();
   },
-  
+
   reorganize: function (mod, selector) {
     var $images = $(selector);
     $images.removeClass('last');
     $.each($images, function() {
       var index = $(this).index(selector + ":visible");
-      if((index + 1) % mod === 0)
+      if((index + 1) % mod === 0) {
         $(this).addClass('last');
+      }
+    });
+  },
+
+  setListOrder: function (selector) {
+    var $images = $(selector);
+    $.each($images, function() {
+      var listOrder = $(this).find('input[name*=list_order]');
+      var index = $(this).index(selector + ":visible");
+      if (listOrder.length > 0) {
+        listOrder.val(index);
+      }
     });
   }
-}
+};

data/lib/forge/lib/assets/stylesheets/forge/assets.css.scss

@@ -35,5 +35,6 @@ ul#assets { list-style:none; padding:20px 0px 20px 10px;
       small { border-bottom:1px solid #343434; color:white; display:block; line-height:20px; padding-bottom:6px; }
     }
     a { color:white; font-size:.8em; text-transform:uppercase; }
+    &.no-search-results { color: white; }
   }
 }

data/lib/forge/vendor/assets/javascripts/jquery.quickSearch.js.erb

@@ -1,5 +1,5 @@
-(function($) { 
-  
+(function($) {
+
   $.fn.quickSearch = function(options) {
     var settings = {
       url: '/',
@@ -7,15 +7,15 @@
       holder: $('#item-list'),
       loader: '<%= asset_path 'forge/ajax-loader.gif' %>'
     };
-    if ( options ) 
+    if ( options )
       $.extend( settings, options );
-    
+
     var previousValue = "";
-    
+
     this.each(function() {
       $(this).keyup($.debounce(settings.delay, runUpdate));
     });
-    
+
     function runUpdate() {
       var currentValue = $(this).val();
 
@@ -23,24 +23,24 @@
       if (currentValue == previousValue) {
         return;
       }
-      
-      // Hide the default content if this is the first time the search is entered  
+
+      // Hide the default content if this is the first time the search is entered
       if (previousValue == '') {
         hideDefaultContent();
       }
-      
+
       previousValue = currentValue;
-      
+
       // Restore the old content if search is cleared
       if (currentValue == '') {
         restoreDefaultContent();
         return;
       }
-      
+
       // Show a loader
       var loader = $('<li />').css('text-align', 'center').html($('<img />').attr('src', settings.loader))
       settings.holder.html(loader);
-      
+
       // Run the query
       $.ajax({
         url: settings.url,
@@ -48,9 +48,11 @@
         dataType: 'HTML',
         success: function(data) {
           if ($.trim(data) == '') {
-            var noResult = $('<li />').html("Sorry, we couldn't find anything for <strong>" + currentValue + "</strong>.<br /><small>Why don't you try a broader search term, we'll do our best to find what you're looking for!</small>")
+            var noResult = $('<li />')
+              .addClass('no-search-results')
+              .html("Sorry, we couldn't find anything for <strong>" + currentValue + "</strong>.<br /><small>Why don't you try a broader search term, we'll do our best to find what you're looking for!</small>")
             settings.holder.html(noResult);
-          } else { 
+          } else {
             settings.holder.html(data);
           }
           if(typeof searchTrigger == 'function') {
@@ -59,14 +61,14 @@
         }
       })
     }
-        
+
     function hideDefaultContent() {
       $('<div id="hidden-quick-search-content"/>').html(settings.holder.html()).css('display', 'none').appendTo('body');
       $('#item-list-bottom div.regular').fadeOut('fast', function() {
         $('#item-list-bottom div.search-results').fadeIn('fast');
       });
     }
-    
+
     function restoreDefaultContent() {
       settings.holder.html($('#hidden-quick-search-content').html());
       $('#item-list-bottom div.search-results').fadeOut('fast', function() {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forge-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - factor[e] design initiative