lsd_rails 0.1.2 → 0.1.3

data/Packages/lsd-mobile/Source/Input/Date.js

@@ -12,7 +12,7 @@ authors: Yaroslaff Fedin
 requires:
   - LSD.Mobile.Input
   - LSD.Mobile.Body.Dialog
-  - LSD/LSD.Trait.Date
+  - LSD/LSD.Mixin.Date
 
 provides: 
   - LSD.Mobile.Input.Date
@@ -21,8 +21,6 @@ provides:
 */
 
 LSD.Mobile.Input.Date = new Class({
-  Implements: LSD.Trait.Date,
-  
   options: {
     attributes: {
       type: 'date'
@@ -32,88 +30,15 @@ LSD.Mobile.Input.Date = new Class({
         focus: 'expand'
       }
     },
-    chain: {
-      prompt: function() {
-        return {action: 'dialog', target: 'datepicker'}
-      },
-      update: function() {
-        return { 
-          callback: function(date) {
-            this.setDate(date);
-            this.collapse();
-          }
-        }
-      }
-    },
-    states: Array.fast('expanded')
-  },
-  
-  initialize: function() {
-    this.parent.apply(this, arguments);
-    this.setDate(this.getDate());
-  },
-  
-  setDate: function(date) {
-    this.parent.apply(this, arguments);
-    if (date) this.element.set('value', this.formatDate(date));
-    if (this.dialog) this.dialog.setDate(date);
-  }
-});
-
-LSD.Mobile.Body.Dialog.Datepicker = new Class({
-  Extends: LSD.Mobile.Body.Dialog,
-  
-  Implements: LSD.Trait.Date,
-  
-  options: {
-    classes: Array.fast('datepicker'),
-    layout: {
-      '::decrementor': 'Previous month',
-      '::incrementor': 'Next month',
-      '::table': true,
-      '::closer': 'Close dialog'
-    },
-    has: {
-      one: {
-        table: {
-          selector: 'table[type=calendar]',
-          events: {
-            set: 'selectDate'
-          }
-        },
-        decrementor: {
-          selector: 'button#decrement',
-          events: {
-            click: 'decrement'
-          }
-        },
-        incrementor: {
-          selector: 'button#increment',
-          events: {
-            click: 'increment'
-          }
-        },
-        closer: {
-          selector: 'button#closer',
-          events: {
-            click: 'cancel'
-          }
+    pseudos: Array.object('date'),
+    states: Array.object('expanded'),
+    events: {
+      self: {
+        setDate: function(date) {
+          if (date) this.element.set('value', this.formatDate(date));
+          if (this.dialog) this.dialog.setDate(date);
         }
       }
     }
-  },
-  
-  getData: function() {
-    return this.date;
-  },
-  
-  setDate: function(date) {
-    this.parent.apply(this, arguments);
-    this.table.setDate(date);
-  },
-  
-  selectDate: function(date) {
-    this.setDate(date);
-    this.submit();
   }
-})
+});

data/Packages/lsd-native/Source/Input/Checkbox.js

@@ -22,13 +22,13 @@ LSD.Native.Input.Checkbox = new Class({
   Extends: LSD.Native.Input,
   
   options: {
-    pseudos: Array.fast('checkbox', 'clickable'),
+    pseudos: Array.object('checkbox', 'clickable'),
+    attributes: {
+      type: 'checkbox'
+    },
     events: {
       _checkbox: {
         self: {
-          setDocument: function() {
-            if (this.attributes.checked) this.click();
-          },
           check: function() {
             this.element.checked = true;
           },

data/Packages/lsd-native/Source/Input/Date.js

@@ -11,7 +11,7 @@ authors: Yaroslaff Fedin
  
 requires:
   - LSD.Native.Input
-  - LSD/LSD.Trait.Date
+  - LSD/LSD.Mixin.Date
 
 provides: 
   - LSD.Native.Input.Date
@@ -20,14 +20,54 @@ provides:
 */
 
 LSD.Native.Input.Date = new Class({
-  Includes: [
-    LSD.Native.Input,
-    LSD.Trait.Date
-  ],
+  Extends: LSD.Native.Input,
   
   options: {
     attributes: {
       type: 'date'
+    },
+    pseudos: Array.object('date'),
+    layout: {
+      'if &:focused': {
+        '::dialog:of-kind(input-date)': {
+          'button.previous': 'Previous month',
+          'button.next': 'Next month',
+          'table[type=calendar]': true
+        }
+      }
+    },
+    relations: {
+      decrementor: {
+        selector: '.previous',
+        events: {
+          click: 'decrement'
+        }
+      },
+      incrementor: {
+        selector: '.next',
+        events: {
+          click: 'increment'
+        }
+      },
+      calendar: {
+        selector: 'table',
+        events: {
+          click: 'increment',
+          set: 'setDate'
+        }
+      }
+    },
+    events: {
+      _date: {
+        build: function() {
+          this.setDate(this.getDate());
+        },
+        setDate: function(date, source) {
+          if (date && !source) this.element.set('value', this.formatDate(date));
+          if (this.calendar) this.calendar.setDate(date);
+        },
+        change: 'setDate'
+      }
     }
   }
-});
+});

data/Packages/lsd-native/Source/Input/Radio.js

@@ -22,13 +22,10 @@ LSD.Native.Input.Radio = new Class({
   Extends: LSD.Native.Input,
 
   options: {
-    pseudos: Array.fast('radio', 'clickable'),
+    pseudos: Array.object('radio', 'clickable'),
     events: {
       _checkbox: {
         self: {
-          setDocument: function() {
-            if (this.attributes.checked) this.click();
-          },
           check: function() {
             this.element.checked = true;
           },

data/Packages/lsd-native/Source/Input.js

@@ -25,12 +25,15 @@ LSD.Native.Input = new Class({
     events: {
       _input: {
         element: {
-          input: 'setValue'
+          input: 'setValue',
+          change: 'setValue',
+          focus: 'onFocus',
+          blur: 'onBlur'
         }
       }
     },
     inline: null,
-    pseudos: Array.fast('form-associated', 'value')
+    pseudos: Array.object('form-associated', 'focusable', 'value')
   },
   
   applyValue: function(value) {
@@ -39,10 +42,6 @@ LSD.Native.Input = new Class({
   
   getRawValue: function() {
     return this.element.get('value');
-  },
-  
-  focus: function() {
-    this.element.focus();
   }
   
 });

data/Packages/lsd-widgets/Source/Body/Dialog.js

@@ -29,12 +29,9 @@ LSD.Widget.Body.Dialog = new Class({
     element: {
       tag: 'section'
     },
-    classes: Array.fast('dialog'),
-    pseudos: Array.fast('fieldset', 'submittable', 'invokable', 'command'),
+    classes: Array.object('dialog'),
+    pseudos: Array.object('fieldset', 'submittable', 'invokable', 'command', 'focusable'),
     clone: true,
-    interpolate: function(string) {
-      this.options.interpolate = LSD.Interpolation.from(this.attributes, this, this.dataset)
-    },
     events: {
       _dialog: {
         element: {
@@ -48,6 +45,7 @@ LSD.Widget.Body.Dialog = new Class({
         },
         setRole: function() {
           var kind = this.attributes.kind;
+            console.error('set role', kind, this.element, this.attributes);
           if (!kind) return;
           var element = Slick.find(document.body, 'dialog#' + kind);
           if (element) return {origin: element};
@@ -58,11 +56,16 @@ LSD.Widget.Body.Dialog = new Class({
       one: {
         form: {
           selector: 'form',
-          as: 'invoker'
+          as: 'invoker',
+          pseudos: Array.object('invokable')
         }
       }
     }
   },
   
+  getParentElement: function() {
+    return document.body;
+  },
+  
   hidden: true
 });

data/Packages/lsd-widgets/Source/Body/Page.js

@@ -25,7 +25,7 @@ LSD.Widget.Body.Page = new Class({
     element: {
       tag: 'section'
     },
-    classes: Array.fast('page'),
+    classes: Array.object('page'),
     nodeType: 1,
     events: {
       _page: {

data/Packages/lsd-widgets/Source/Body.js

@@ -22,6 +22,6 @@ provides:
 LSD.Widget.Body = new Class({
   options: {
     tag: 'body',
-    pseudos: Array.fast('root')
+    pseudos: Array.object('root')
   }
 });

data/Packages/lsd-widgets/Source/Button.js

@@ -24,7 +24,7 @@ LSD.Widget.Button = new Class({
   options: {
     tag: 'button',
     inline: true,
-    pseudos: Array.fast('touchable', 'clickable', 'command')
+    pseudos: Array.object('touchable', 'clickable', 'command')
   },
   
   write: function(content) {

data/Packages/lsd-widgets/Source/Form.js

@@ -24,7 +24,7 @@ provides:
 LSD.Widget.Form = new Class({
   options: {
     tag: 'form',
-    pseudos: Array.fast('form', 'fieldset', 'command', 'submittable'),
+    pseudos: Array.object('form', 'fieldset', 'command', 'submittable'),
     events: {
       self: {
         build: function() {

data/Packages/lsd-widgets/Source/Input/Checkbox.js

@@ -23,9 +23,9 @@ provides:
 LSD.Widget.Input.Checkbox = new Class({
   options: {
     tag: 'input',
+    pseudos: Array.object('clickable', 'focusable', 'checkbox', 'value', 'form-associated'),
     shortcuts: {
       space: 'toggle'
-    },
-    pseudos: Array.fast('clickable', 'focusable', 'checkbox', 'value', 'form-associated')
+    }
   }
 });

data/Packages/lsd-widgets/Source/Input/Date.js

@@ -10,7 +10,8 @@ license: Public domain (http://unlicense.org).
 authors: Yaroslaff Fedin
  
 requires:
-- LSD.Widget.Input
+  - LSD.Widget.Input
+  - LSD.Widget.Table.Calendar
 
 provides: [LSD.Widget.Input.Date]
  
@@ -18,26 +19,54 @@ provides: [LSD.Widget.Input.Date]
 */
 
 LSD.Widget.Input.Date = new Class({
-  Extends: LSD.Trait.Date,
+  Extends: LSD.Widget.Input,
   
   options: {
     attributes: {
       type: 'date'
     },
-    dialogs: {
-      
-    }
-  },
-  
-  initializers: {
-    date: function() {
-      this.setDate(this.getDate());
+    pseudos: Array.object('date'),
+    layout: {
+      'if &:focused': {
+        '::dialog:of-kind(input-date)': {
+          'button.previous': 'Previous month',
+          'button.next': 'Next month',
+          'table[type=calendar]': true
+        }
+      }
+    },
+    relations: {
+      decrementor: {
+        selector: '.previous',
+        events: {
+          click: 'decrement'
+        }
+      },
+      incrementor: {
+        selector: '.next',
+        events: {
+          click: 'increment'
+        }
+      },
+      calendar: {
+        selector: 'table',
+        events: {
+          click: 'increment',
+          set: 'setDate'
+        }
+      }
+    },
+    events: {
+      _date: {
+        build: function() {
+          this.setDate(this.getDate());
+        },
+        setDate: function(date, source) {
+          if (date && !source) this.element.set('value', this.formatDate(date));
+          if (this.calendar) this.calendar.setDate(date);
+        },
+        change: 'setDate'
+      }
     }
-  },
-  
-  setDate: function(date) {
-    this.parent.apply(this, arguments);
-    if (date) this.element.set('value', this.formatDate(date));
-    if (this.dialog) this.dialog.setDate(date);
   }
 });

data/Packages/lsd-widgets/Source/Input/File.js

@@ -31,8 +31,8 @@ LSD.Widget.Input.File = new Class({
       url: '/blobs.json',
       fieldName: 'blob'
     },
-    pseudos: Array.fast('uploader', 'focusable', 'form-associated', 'value'),
-    layout: Array.fast('::list'),
+    pseudos: Array.object('uploader', 'focusable', 'form-associated', 'value'),
+    layout: Array.object('::list'),
     proxies: {
       files: {
         condition: function(widget) {

data/Packages/lsd-widgets/Source/Input/HTML.js

@@ -24,12 +24,12 @@ provides:
 LSD.Widget.Input.Html = LSD.Widget.Input.HTML = new Class({
   options: {
     tag: 'input',
-    pseudos: Array.fast('form-associated', 'value'),
+    pseudos: Array.object('form-associated', 'value'),
     attributes: {
       contenteditable: 'editor',
       tabindex: 0
     },
-    states: Array.fast('editing'),
+    states: Array.object('editing'),
     events: {
       self: {
         focus: 'edit',

data/Packages/lsd-widgets/Source/Input/Radio.js

@@ -23,7 +23,7 @@ provides: [LSD.Widget.Input.Radio]
 LSD.Widget.Input.Radio = new Class({
   options: {
     tag: 'input',
-    pseudos: Array.fast('focusable', 'clickable', 'radio', 'form-associated', 'value'),
+    pseudos: Array.object('focusable', 'clickable', 'radio', 'form-associated', 'value'),
     shortcuts: {
       space: 'click'
     }

data/Packages/lsd-widgets/Source/Input/Range.js

@@ -30,7 +30,7 @@ LSD.Widget.Input.Range = new Class({
       next: 'increment',
       previous: 'decrement'
     },
-    layout: Array.fast('::thumb'),
+    layout: Array.object('::thumb'),
     has: {
       one: {
         thumb: {
@@ -39,7 +39,7 @@ LSD.Widget.Input.Range = new Class({
         }
       }
     },
-    pseudos: Array.fast('focusable', 'value', 'form-associated')
+    pseudos: Array.object('focusable', 'value', 'form-associated')
   },
   
   initialize: function() {

data/Packages/lsd-widgets/Source/Input/Submit.js

@@ -42,7 +42,7 @@ LSD.Widget.Button.Submit = new Class({
         if (target) return {action: 'submit', target: target};
       }
     },
-    pseudos: Array.fast('form-associated', 'value', 'command')
+    pseudos: Array.object('form-associated', 'value', 'command')
   }
 });
 

data/Packages/lsd-widgets/Source/Input.js

@@ -28,7 +28,7 @@ LSD.Widget.Input = new Class({
     attributes: {
       type: 'text'
     },
-    pseudos: Array.fast('form-associated', 'value'),
+    pseudos: Array.object('form-associated', 'value'),
     events: {
       _input: {
         focus: function() {
@@ -39,12 +39,7 @@ LSD.Widget.Input = new Class({
         }
       }
     },
-    states: Array.fast('focused')
-  },
-  
-  retain: function() {
-    this.focus(false);
-    return false;
+    states: Array.object('focused')
   },
   
   applyValue: function(item) {
@@ -53,10 +48,6 @@ LSD.Widget.Input = new Class({
 
   getRawValue: function() {
     return ('value' in this.attributes) && this.element.get('value');
-  },
-
-  focus: function() {
-    this.element.focus();
   }
 
 });

data/Packages/lsd-widgets/Source/Label.js

@@ -24,9 +24,6 @@ LSD.Widget.Label = new Class({
     has: {
       one: {
         control: {
-          expectation: function() {
-            return {combinator: ' ', tag: '*', pseudos: [{key: 'form-associated'}]}
-          },
           collection: 'labels',
           states: {
             get: {
@@ -41,14 +38,13 @@ LSD.Widget.Label = new Class({
         widget[state ? 'addRelation' : 'removeRelation']('control', {
           expectation: function() {
             var id = this.attributes['for'];
-            if (id) return {id: id, combinator: ' ', tag: '*'};
-          },
-          target: 'root'
+            if (id) return {id: id, combinator: '&&', tag: '*'};
+          }
         });
       }
     },
-    pseudos: Array.fast('form-associated', 'clickable', 'command', 'value'),
-    states: Array.fast('invalid'),
+    pseudos: Array.object('form-associated', 'clickable', 'command'),
+    states: Array.object('invalid'),
     chain: {
       focusControl: function() {
         if (this.control) return {

data/Packages/lsd-widgets/Source/Menu/List.js

@@ -25,7 +25,7 @@ LSD.Widget.Menu.List = new Class({
   Extends: LSD.Widget.Menu,
   
   options: {
-    pseudos: Array.fast('list', 'value'),
+    pseudos: Array.object('list', 'value'),
     attributes: {
       type: 'list'
     },
@@ -34,7 +34,7 @@ LSD.Widget.Menu.List = new Class({
         items: {
           source: 'menu-list-option',
           mutation: '> button, > li, > command, > option',
-          pseudos: Array.fast('clickable')
+          pseudos: Array.object('clickable')
         }
       }
     }
@@ -44,6 +44,6 @@ LSD.Widget.Menu.List = new Class({
 LSD.Widget.Menu.List.Option = new Class({
   options: {
     tag: 'option',
-    pseudos: Array.fast('item')
+    pseudos: Array.object('item')
   }
 });

data/Packages/lsd-widgets/Source/Menu.js

@@ -25,7 +25,7 @@ LSD.Widget.Menu = new Class({
   options: {
     tag: 'menu',
     inline: null,
-    pseudos: Array.fast('list')
+    pseudos: Array.object('list')
   }
 });
 
@@ -33,6 +33,6 @@ LSD.Widget.Menu.Command = new Class({
   options: {
     tag: 'command',
     inline: null,
-    pseudos: Array.fast('item')
+    pseudos: Array.object('item')
   }
 });

data/Packages/lsd-widgets/Source/Progress.js

@@ -22,7 +22,7 @@ LSD.Widget.Progress = new Class({
   options: {
     tag: 'progress',
     inline: null,
-    pseudos: Array.fast('value'),
+    pseudos: Array.object('value'),
     events: {
       _initial: {
         self: {

data/Packages/lsd-widgets/Source/Select.js

@@ -11,10 +11,11 @@ authors: Yaroslaff Fedin
  
 requires:
 - LSD/LSD.Widget
-- LSD.Widget.Menu
 - LSD.Widget.Button
+- LSD.Widget.Menu.Context
 - LSD/LSD.Mixin.List
 - LSD/LSD.Mixin.Choice
+- LSD/LSD.Mixin.Touchable
 - LSD/LSD.Mixin.Focusable
 
 provides: [LSD.Widget.Select, LSD.Widget.Select.Button, LSD.Widget.Select.Option]
@@ -25,7 +26,7 @@ provides: [LSD.Widget.Select, LSD.Widget.Select.Button, LSD.Widget.Select.Option
 LSD.Widget.Select = new Class({
   options: {
     tag: 'select',
-    pseudos: Array.fast('list', 'choice', 'focusable', 'value', 'form-associated'),
+    pseudos: Array.object('list', 'choice', 'focusable', 'value', 'form-associated'),
     events: {
       self: {
         set: function(item) {
@@ -34,7 +35,7 @@ LSD.Widget.Select = new Class({
         }
       }
     },
-    layout: Array.fast('::button'),
+    layout: Array.object('::button'),
     has: {
       many: {
         items: {
@@ -43,14 +44,14 @@ LSD.Widget.Select = new Class({
           states: {
             hover: 'chosen'
           },
-          pseudos: Array.fast('clickable', 'hoverable', 'command')
+          pseudos: Array.object('clickable', 'hoverable', 'command')
         }
       },
       one: {
         menu: {
           proxy: function(widget) {
             if (!widget.pseudos.item) return;
-            if (!this.getSelectedItem() || widget.pseudos.selected) this.selectItem(widget)
+            // if (!this.selectedItems[0] || widget.pseudos.selected) widget.select()
             return true;
           }
         },
@@ -68,7 +69,7 @@ LSD.Widget.Select.Button = LSD.Widget.Button;
 LSD.Widget.Select.Option = new Class({
   options: {
     tag: 'option',
-    pseudos: Array.fast('item')
+    pseudos: Array.object('item')
   },
   
   getTitle: function() {