zena 1.2.2 → 1.2.3

data/lib/zena/use/zafu_safe_definitions.rb

@@ -1,10 +1,66 @@
 module Zena
   module Use
     module ZafuSafeDefinitions
+      # This is a dummy class to declare safe parameters on params.
       class ParamsDictionary
         include RubyLess
         safe_method ['[]', Symbol] => {:class => String, :nil => true}
       end
+      
+      # This class is used to return Array params ['foo', 'bar'] as ['foo', 'bar'], not 'foobar'.
+      # It also splits String params 'foo, bar' as ['foo', 'bar'].
+      class AParamsDictionary
+        def initialize(params)
+          @aparams = {}
+          params.each do |k, v|
+            @aparams[k.to_sym] = transform(v)
+          end
+          
+          def [](key)
+            @aparams[key.to_sym] || []
+          end
+        end
+        
+        include RubyLess
+        safe_method ['[]', Symbol] => {:class => [String], :nil => false}
+        
+        private
+          def transform(v)
+            if v.kind_of?(Array)
+              v.map {|k| k.to_s}.select{|e| !e.blank?}
+            elsif v.kind_of?(String)
+              v.split(',').map(&:strip).select{|e| !e.blank?}
+            else
+              []
+            end
+          end
+      end
+      
+      # This class is used to access nested Hash params {:key => 'foo'}.
+      class HParamsDictionary
+        def initialize(params)
+          @params = {}
+          params.each do |k, v|
+            @params[k.to_sym] = transform(v)
+          end
+        end
+        
+        def [](key)
+          @params[key.to_sym] || {}
+        end
+        
+        include RubyLess
+        safe_method ['[]', Symbol] => {:class => ParamsDictionary, :nil => false}
+        
+        private
+          def transform(v)
+            if v.kind_of?(Hash)
+              v
+            else
+              {}
+            end
+          end
+      end
 
       module ViewMethods
         include RubyLess
@@ -96,10 +152,13 @@ module Zena
         end
 
         safe_method :params => ParamsDictionary
+        safe_method :aparams => AParamsDictionary
+        safe_method :hparams => HParamsDictionary
+        
         safe_method :now    => {:method => 'Time.now', :class => Time}
         safe_method :string_hash => {:method => 'StringHash.new', :class => StringHash}
         safe_method [:string_hash, Hash] => {:method => 'StringHash.from_hash', :class => StringHash}
-        safe_method [:h, String] => {:class => String, :nil => true}
+        safe_method [:h, String] => {:class => String, :accept_nil => true}
         safe_method_for String, [:gsub, Regexp, String] => {:class => String, :pre_processor => true}
         safe_method_for String, :upcase    => {:class => String, :pre_processor => true}
         safe_method_for String, :strip     => {:class => String, :pre_processor => true}
@@ -107,8 +166,8 @@ module Zena
         safe_method_for String, :url_name  => {:class => String, :pre_processor => true, :method => :url_name}
         safe_method_for String, :to_i      => {:class => Number, :pre_processor => true}
         safe_method_for String, :to_s      => {:class => String, :pre_processor => true}
-        safe_method_for String, [:limit, Number]  => {:class => String, :pre_processor => true}
-        safe_method_for String, [:limit, Number, String]  => {:class => String, :pre_processor => true}
+        safe_method_for String, [:limit, Number]  => {:class => String, :pre_processor => true, :html_safe => true}
+        safe_method_for String, [:limit, Number, String]  => {:class => String, :pre_processor => true, :html_safe => true}
         safe_method_for String, :to_f      => {:class => Number, :pre_processor => true}
         safe_method_for String, :to_json   => {:class => String, :pre_processor => true}
         safe_method_for String, [:split, String] => {:class => [String], :pre_processor => true}
@@ -120,6 +179,8 @@ module Zena
         safe_method_for Number, :fmt       => {:class => String, :pre_processor => true}
         safe_method_for Number, [:fmt, Number] => {:class => String, :pre_processor => true}
 
+        safe_method_for Range, :to_a       => {:class => [Number], :pre_processor => true}
+
         safe_method_for NilClass, :to_f    => {:class => Number, :pre_processor => true}
         safe_method_for NilClass, :to_i    => {:class => Number, :pre_processor => true}
         safe_method_for NilClass, :to_json => {:class => String, :pre_processor => true}
@@ -168,6 +229,14 @@ module Zena
         def zafu_max(a, b)
           [a, b].max
         end
+        
+        def aparams
+          @aparams ||= AParamsDictionary.new(params)
+        end
+        
+        def hparams
+          @hparams ||= HParamsDictionary.new(params)
+        end
       end # ViewMethods
 
 

data/lib/zena/use/zazen.rb

@@ -65,7 +65,9 @@ module Zena
             if text[0..0] == ' '
               text = "\n\n#{text}"
             end
-            res = ZazenParser.new(text,:helper=>self).render(opt)
+            @zazen = ZazenParser.new(text, :helper=>self)
+            res = @zazen.render(opt)
+            @zazen = nil
             if no_p && !text.include?("\n")
               res.gsub(%r{\A<p>|</p>\Z},'')
             else
@@ -75,6 +77,14 @@ module Zena
         rescue Timeout::Error
           return %Q{<span class='parser_error'>#{_('Could not render text (Timeout error)')}</span>}
         end
+        
+        def raw_content(txt)
+          if @zazen
+            @zazen.raw_content(txt)
+          else
+            txt
+          end
+        end
 
         # TODO: test
         def zazen_diff(text1, text2, opt={})
@@ -172,7 +182,7 @@ module Zena
         def make_image(opts)
           id, style, link, mode, title = opts[:id], opts[:style], opts[:link], opts[:mode], opts[:title]
           mode ||= 'std' # default mode
-          img = opts[:node] || secure(Document) { Document.find_by_zip(id) }
+          img = opts[:node] || secure(Node) { Node.find_by_zip(id) }
 
           return "<span class='unknownLink'>#{_('unknown document')}</span>" unless img
 
@@ -182,11 +192,13 @@ module Zena
           title = img.summary if title == ""
 
           image = img_tag(img, :mode=>mode, :host=>opts[:host])
+          
+          return "<span class='unknownLink'>#{_('invalid document')}</span>" unless image
 
           unless link
-            if id[0..0] == "0" || !img.kind_of?(Image)
+            if id[0..0] == "0" || (!img.kind_of?(Image) && !(image =~ /ZAZENBLOCKCODE/))
               # if the id starts with '0' or it is not an Image, link to data
-              link = zen_path(img, :format => img.ext)
+              link = zen_path(img, :format => img.prop['ext'])
               link_tag = "<a class='popup' href='#{link}' target='_blank'>"
             end
           end

data/lib/zena.rb

@@ -315,6 +315,7 @@ EXT_TYPE = [
   [ "jpe"       , "image/jpeg"                     ],
   [ "jpeg"      , "image/jpeg"                     ],
   [ "js"        , "application/x-javascript"       ],
+  [ "js"        , "text/javascript"                ],
   [ "kar"       , "audio/midi"                     ],
   [ "latex"     , "application/x-latex"            ],
   [ "lha"       , "application/octet-stream"       ],

data/public/javascripts/grid.js

@@ -18,27 +18,10 @@ Grid.log = function(what, msg) {
 }
 
 Grid.changed = function(cell, val, prev, skip_html) {
-  if (!skip_html) {
-    if (val.value == val.show) {
-      cell.innerHTML = val.value
-    } else {
-      cell.innerHTML = val.show
-      cell.setAttribute('data-v', val.value)
-    }
-  }
   var row = cell.up('tr')
   var table = row.up('table')
   var grid = table.grid
-  if (prev.value == val.value) return;
-  if (cell.orig_value == val.value) {
-    cell.removeClassName('changed')
-    if (row.select('.changed').length == 0) {
-      row.removeClassName('changed')
-    }
-  } else {
-    cell.addClassName('changed')
-    row.addClassName('changed')
-  }
+  
   var pos = Grid.pos(cell)
 
   var attr, id
@@ -53,6 +36,34 @@ Grid.changed = function(cell, val, prev, skip_html) {
       id = Grid.buildObj(grid, row)
     }
   }
+  
+  if (!skip_html) {
+    var show_h = grid.show[attr] || {}
+    if (cell.hasAttribute('data-v')) cell.setAttribute('data-v', val.value)
+    cell.innerHTML = show_h[val.value] || val.show
+  }
+  
+  if (grid.onChange) {
+    // onChange can be used to recompute total (so cell value should be set first)
+    var v = val.value
+    val = grid.onChange(cell, val, attr)
+    if (!val) return
+    if (v != val.value) {
+      cell.innerHTML = val.show
+      if (cell.hasAttribute('data-v')) cell.setAttribute('data-v', val.value)
+    } 
+  }
+  
+  if (prev.value == val.value) return;
+  if (cell.orig_value == val.value) {
+    cell.removeClassName('changed')
+    if (row.select('.changed').length == 0) {
+      row.removeClassName('changed')
+    }
+  } else {
+    cell.addClassName('changed')
+    row.addClassName('changed')
+  }
 
   var change = {
     id: id,
@@ -102,27 +113,28 @@ Grid.buildObj = function(grid, row) {
 }
 
 Grid.closeCell = function(e) {
-  if (Grid.in_paste) return
+  if (Grid.no_blur) return
   var cell = e.tagName ? e : e.element().up()
   var table = cell.up('table')
   var prev = cell.prev_value
   var val  = Grid.getValue(cell)
 
-  if (table.grid.list_name) {
+  if (table.grid.is_list) {
     if (val.value == 'on') {
       cell.addClassName('on')
     } else {
       cell.removeClassName('on')
     }
-  } else {
-    cell.removeClassName('input')
   }
+  cell.removeClassName('input')
 
   Grid.changed(cell, val, prev)
 
   if (table.grid.input) {
     // single attribute table, serialize in input field
     table.grid.input.value = Grid.serialize(table)
+  } else if (table.grid.autoSave) {
+    Grid.save(table.id)
   }
 }
 
@@ -150,9 +162,9 @@ Grid.paste = function(event) {
       bottom: "<textarea style='position:fixed; top:0; left:10100px;' id='grid_p_" + table.grid.id + "'></textarea>"
     });
     paster = $("grid_p_" + table.grid.id);
-    Grid.in_paste = true // prevent original input blur
+    Grid.no_blur = true // prevent original input blur
     paster.focus();
-    Grid.in_paste = false
+    Grid.no_blur = false
   }
   setTimeout(function() {
     var text
@@ -264,6 +276,11 @@ Grid.keydown = function(event) {
       return false
     } else if (cell.childElements().first().tagName == 'SELECT' && event.shiftKey) {
       return
+    } else if (grid.autoSave) {
+      // this will close cell
+      var i = cell.childElements().first()
+      if (i) i.blur()
+      return
     }
     var pos = Grid.pos(cell);
     // go to next row
@@ -306,18 +323,39 @@ Grid.keydown = function(event) {
 }
 
 Grid.isReadOnly = function(cell) {
-  return cell.select('a').length > 0 || cell.getAttribute('data-m') == 'r'
+  return cell.select('a').length > 0 || cell.getAttribute('data-m') == 'r' || cell.hasClassName('action')
 }
 
-Grid.openCell = function(cell) {
-  if (cell.hasClassName('input') || Grid.isReadOnly(cell)) return;
+Grid.closeCheckbox = function() {
+  if (Grid.need_close) {
+    Grid.closeCell(Grid.need_close)
+    Grid.need_close = false
+  }
+}
+Grid.openCell = function(cell, get_next) {
+  var get_next = get_next == undefined ? true : get_next
+  Grid.closeCheckbox()
+  
+  if (cell.hasClassName('input')) return;
+  if (Grid.isReadOnly(cell)) {
+    if (get_next) {
+      var n = Element.next(cell) || cell.up().nextSiblings().first().childElements()[0]
+      if (n) {
+        return Grid.openCell(n)
+      } else {
+        return false
+      }
+    } else {
+      return false
+    }
+  }
   var val = Grid.getValue(cell)
   cell.prev_value = val;
 
   var value = val.value
   var table = cell.up('table')
 
-  if (table.grid.list_name) {
+  if (table.grid.is_list) {
     if (value == 'on') {
       cell.setAttribute('data-v', 'off')
     } else {
@@ -353,16 +391,23 @@ Grid.openCell = function(cell) {
       input = cell.childElements()[0]
       input.value = value
     }
+
     input.setStyle({
       width: w + 'px',
       height: h + 'px'
     })
-    input.observe('blur', Grid.closeCell)
+    
+    if (input.type == 'checkbox') {
+      Grid.need_close = cell
+    } else {
+      input.observe('blur', Grid.closeCell)
+    }
     input.observe('keydown', Grid.keydown)
     input.observe('paste', Grid.paste)
     input.focus()
     input.select()
   }
+  return true
 }
 
 Grid.click = function(event) {
@@ -371,13 +416,19 @@ Grid.click = function(event) {
   var table = cell.up('table')
   if (row.hasClassName('action')) {
     Grid.action(event, cell, row, true)
+    Event.stop(event)
   } else if (cell.hasClassName('action')) {
     Grid.action(event, cell, row, false)
+    Event.stop(event)
   } else if (cell.tagName == 'TH' && !table.grid.attr_name) {
     // sort
     Grid.sort(cell)
+    Event.stop(event)
   } else {
-    Grid.openCell(cell)
+    if (event.element().tagName == 'INPUT') return;
+    if (Grid.openCell(cell, false)) {
+      Event.stop(event)
+    }
   }
 }
 
@@ -438,10 +489,15 @@ Grid.copy = function(cell) {
 
 Grid.addRow = function(table, row) {
   // insert row below
-  var row_str = '<tr>';
-  var cells = row.childElements();
-  for (var i = 0; i < cells.length -1; i++) {
-    row_str = row_str + '<td></td>';
+  var row_str = '<tr>'
+  var grid = table.grid
+  if (grid.newRow) {
+    row_str = row_str + $(grid.newRow).innerHTML
+  } else {
+    var cells = row.childElements()
+    for (var i = 0; i < cells.length -1; i++) {
+      row_str = row_str + '<td></td>'
+    }
   }
   row_str = row_str + Grid.Buttons(table.grid) + '</tr>';
   row.insert({
@@ -723,26 +779,37 @@ Grid.make = function(table, opts) {
   if (table.grid) return;
   Grid.grid_c++;
   Grid.grids[Grid.grid_c] = table;
-  table.grid = {
+  var grid = {
     changes: [],
     id: Grid.grid_c,
-    helper_id: table.getAttribute('data-helper'),
-    fdate: table.getAttribute('data-fdate'),
+    helper_id: opts.helper || table.getAttribute('data-helper'),
+    fdate: opts.fdate || table.getAttribute('data-fdate'),
+    newRow: opts.newRow,
     counter: 0, // Used to create dom_ids for new objects
     onSuccess: opts.onSuccess,
     onFailure: opts.onFailure || Grid.onFailure,
     onStart: opts.onStart || Grid.onStart,
+    onChange: opts.onChange,
+    // Save on cell close
+    autoSave: opts.autoSave || false,
+    sort: opts.sort == undefined ? true : opts.sort,
     add: opts.add || opts.add == undefined,
     remove: opts.remove || opts.remove == undefined,
     keydown: opts.keydown,
+    show: opts.show || {},
   };
+  table.grid = grid
+  grid.table = table
   
   // Detect type.
-  table.grid.attr_name = table.getAttribute('data-a');
-  table.grid.list_name = table.getAttribute('data-l');
+  grid.attr_name = table.getAttribute('data-a')
+  grid.list_name = table.getAttribute('data-l')
+  // Reverse list name (update columns instead of rows)
+  grid.rlist_name = table.getAttribute('data-r')
+  grid.is_list = grid.list_name || grid.rlist_name
 
   var empty = false;
-  if (table.grid.attr_name && table.select('th').length == 0) {
+  if (grid.attr_name && table.select('th').length == 0) {
     empty = true;
     var msg = table.getAttribute('data-msg') || "type to edit";
     table.innerHTML = "<tr><th>" + msg + "</th></tr><tr><td></td></tr>";
@@ -752,27 +819,34 @@ Grid.make = function(table, opts) {
   Grid.addButtons(table)
   
 
-  if (table.grid.attr_name) {
+  if (grid.attr_name) {
+    table.insert({
+      after: "<p class='grid_btn'><a class='undo' href='javascript:' onclick='Grid.undo(" + Grid.grid_c + ")'>undo</a></p>"
+    });
     // If we have an attr_name, rows and columns are
     // serialized as json in a single field.
     table.insert({
-      after: "<input type='hidden' id='grid_a_" + Grid.grid_c + "' name='" + table.grid.attr_name + "'/>"
+      after: "<input type='hidden' id='grid_a_" + Grid.grid_c + "' name='" + grid.attr_name + "'/>"
     });
-    table.grid.input = $("grid_a_" + Grid.grid_c);
-    if (!empty) table.grid.input.value = Grid.serialize(table);
+    grid.input = $("grid_a_" + Grid.grid_c);
+    if (!empty) grid.input.value = Grid.serialize(table);
   } else {
+    // Otherwise each row is a new object and each column
+    // corresponds to a different attribute (defined in the 
+    // 'th' of the table).
     var rows = table.select('tr')
     for (var i = 1; i < rows.length; i++) {
-      if (!rows[i].id) {
+      if (rows[i].id || rows[i].getAttribute('data-m') == 'r') {
+        // do not create object
+      } else {
         Grid.buildObj(table.grid, rows[i])
       }
     }
-    // Otherwise each row is a new object and each column
-    // corresponds to a different attribute (defined in the 
-    // 'th' of the table).
-    table.insert({
-      after: "<p class='grid_btn'><a class='save' href='javascript:' onclick='Grid.save(" + Grid.grid_c + ")'>save</a> <a class='undo' href='javascript:' onclick='Grid.undo(" + Grid.grid_c + ")'>undo</a></p>"
-    });
+    if (!grid.autoSave) {
+      table.insert({
+        after: "<p class='grid_btn'><a class='save' href='javascript:' onclick='Grid.save(" + Grid.grid_c + ")'>save</a> <a class='undo' href='javascript:' onclick='Grid.undo(" + Grid.grid_c + ")'>undo</a></p>"
+      });
+    }
   }
 
   table.observe('click', Grid.click);
@@ -795,22 +869,22 @@ Grid.clearChanges = function(list, id) {
 }
 
 Grid.isChanged = function(elem) {
-  var table = $(elem)
-  var grid = table.grid
-  // buildObj adds a row per new object on load
-  return grid.changes.length > (table.attr_name ? 0 : table.select('tr').length - 1)
+  return $$('#'+$(elem).id+' .changed').length > 0
 }
 
-
 Grid.save = function(grid_id) {
   // do not run on GUI thread
   setTimeout(function() {
-    var table = Grid.grids[grid_id]
+    Grid.closeCheckbox()
+    var table = Grid.grids[grid_id] || $(grid_id)
     var grid  = table.grid
     var data  = Grid.compact(grid.changes)
     if (grid.list_name) {
       data = Grid.dataForList(grid, data)
+    } else if (grid.rlist_name) {
+      data = Grid.dataForReverseList(grid, data)
     }
+
     var todo_count = data.keys().length
     var done_count = 0
     if (grid.onStart) {
@@ -822,8 +896,9 @@ Grid.save = function(grid_id) {
           operations.put = (operations.put || 0) + 1
         }
       })
-      if (!grid.onStart(operations)) return
+      if (!grid.onStart(operations, data)) return
     }
+
     data.each(function(pair) {
       var id = pair.key
       var changes = pair.value
@@ -833,6 +908,7 @@ Grid.save = function(grid_id) {
           attrs['node['+pair.key+']'] = pair.value
         }
       })
+
       if (changes._new) {
         new Ajax.Request('/nodes', {
           parameters: attrs,
@@ -864,7 +940,7 @@ Grid.save = function(grid_id) {
           method: 'post'
         });
       } else {
-        new Ajax.Request('/nodes/' + id.replace('id_',''), {
+        new Ajax.Request('/nodes/' + id.replace(/^[^0-9]+/,''), {
           parameters: attrs,
           onSuccess: function(transport) {
             done_count++
@@ -884,7 +960,9 @@ Grid.save = function(grid_id) {
 }
 
 Grid.undo = function(grid_id, skip_undone) {
-  var table = Grid.grids[grid_id]
+  Grid.closeCheckbox()
+    
+  var table = Grid.grids[grid_id] || $(grid_id)
   var grid = table.grid
   var changes = grid.changes
   var last = changes.last()
@@ -911,7 +989,7 @@ Grid.undo = function(grid_id, skip_undone) {
       [cell, cell.up()].invoke('addClassName', 'changed')
     }
     cell.addClassName('undone')
-    if (grid.list_name) {
+    if (grid.is_list) {
       cell.setAttribute('data-v', value)
       if (value == 'on') {
         cell.addClassName('on')
@@ -927,6 +1005,11 @@ Grid.undo = function(grid_id, skip_undone) {
     changes.pop()
   }
 
+  if (grid.input) {
+    // single attribute table, serialize in input field
+    grid.input.value = Grid.serialize(table)
+  }
+  
   if (!skip_undone) {
     setTimeout(function() {
       table.select('.undone').invoke('removeClassName', 'undone')
@@ -965,6 +1048,9 @@ Grid.test = function() {
 // detects which rows have changes and builds the full list of
 // ids in the format some_relation_ids:"123,345,888,432". Other fields
 // are kept as is.
+// If update_relation_for is 'column', the list of ids is reversed (they
+// contain the row ids) and we build operation for setting the relation 
+// with the column id).
 Grid.dataForList = function(grid, data) {
   var res = {}
   var list_name = grid.list_name
@@ -999,6 +1085,43 @@ Grid.dataForList = function(grid, data) {
   return $H(res)
 }
 
+Grid.dataForReverseList = function(grid, data) {
+  var res = {}
+  var rlist_name = grid.rlist_name
+  // {"id_184": {"147": "on"}, "id_193": {"147": "on", "146": "off"}}
+  data.each(function(pair) {
+    var def = pair.value
+    for (var key in def) {
+      if (parseInt(key) + '' == key) {
+        // number key = there is a change in the list
+        var col = res[key]
+        if (!col) {
+          // build full column update operation
+          col = {id:key}
+          res[key] = col
+          var list = []
+          var pos = grid.pos[key]
+          var rows = grid.table.childElements()[0].select('tr')
+          for(var i = rows.length - 1; i >= 0; i--) {
+            var row = rows[i]
+            if (row.getAttribute('data-m') != 'r') {
+              var cell = rows[i].childElements()[pos]
+              if (cell && cell.hasClassName('on')) {
+                list.push(row.id.sub(/^[^\d]+/,''))
+              }
+            }
+          }
+          col[rlist_name] = list.join(',')
+        } 
+      } else {
+        // ignore other attributes
+      }
+    }
+  })
+
+  return $H(res)
+}
+
 Grid.notify = function(table, changes) {
   var rows = table.childElements()[0].select('tr')
   var grid = table.grid
@@ -1011,10 +1134,11 @@ Grid.notify = function(table, changes) {
     } else {
       row = $(obj_id)
     }
-    var cells = row.childElements()
+
     var change = changes[obj_id]
     for (var attr in change) {
       if (attr == 'id') continue
+
       if (attr == grid.list_name) {
         var list_on = change[attr].split(/,/)
         var cells = row.childElements()
@@ -1031,11 +1155,36 @@ Grid.notify = function(table, changes) {
             }
             cell.prev_value = undefined
             cell.removeClassName('error')
+            if (cell.hasClassName('changed')) cell.addClassName('saved')
             cell.removeClassName('changed')
-            cell.addClassName('saved')
+          }
+        }
+      } else if (attr == grid.rlist_name) {
+        var list_on = change[attr].split(/,/)
+        var pos = grid.pos[obj_id.sub(/^[^\d]+/,'')]
+        var rows = grid.table.childElements()[0].select('tr')
+        for(var i = rows.length - 1; i >= 0; i--) {
+          var row = rows[i]
+          if (row.getAttribute('data-m') != 'r') {
+            var cell = row.childElements()[pos]
+            if (list_on.indexOf(row.id.sub(/^[^\d]+/,'')) >= 0) {
+              cell.orig_value = 'on'
+              cell.setAttribute('data-v', 'on')
+            } else {
+              cell.orig_value = 'off'
+              cell.setAttribute('data-v', 'off')
+            }
+            cell.prev_value = undefined
+            cell.removeClassName('error')
+            if (cell.hasClassName('changed')) cell.addClassName('saved')
+            cell.removeClassName('changed')
+            if (row.select('.changed').length == 0) {
+              row.removeClassName('changed')
+            }
           }
         }
       } else {
+        var cells = row.childElements()
         var cell
         var i = pos[attr]
         if (i == undefined) continue
@@ -1059,7 +1208,7 @@ Grid.notify = function(table, changes) {
   // later
   setTimeout(function() {
     table.select('.saved').invoke('removeClassName', 'saved')
-  }, 1000)
+  }, 600)
 }
 
 Grid.simulateClick = function(l) {