lanes 0.1.9 → 0.1.9.5

data/client/lanes/react/mixins/MonitorSize.coffee

@@ -0,0 +1,11 @@
+Lanes.React.Mixins.MonitorSize = {
+    contextTypes:
+        viewport: Lanes.PropTypes.State.isRequired
+
+    _updateViewportSize: ->
+        this.setState(_.pick(@context.viewport, 'width', 'height'))
+
+    componentDidMount: ->
+        if @context.viewport
+            @data.listenTo(@context.viewport, 'change:height change:width', @_updateViewportSize)
+}

data/client/lanes/react/mixins/ReadEditingState.coffee

@@ -0,0 +1,11 @@
+Lanes.React.Mixins.ReadEditingState = {
+    contextTypes:
+        recordDisplay:  React.PropTypes.oneOf(
+            ['edit', 'display']
+        )
+        writable: React.PropTypes.bool
+        readonly: React.PropTypes.bool
+
+    isEditingRecord: ->
+        @props.editOnly or @context.recordDisplay == 'edit'
+}

data/client/lanes/react/mixins/RelayEditingState.coffee

@@ -0,0 +1,17 @@
+Lanes.React.Mixins.RelayEditingState = {
+    childContextTypes:
+        recordDisplay: React.PropTypes.oneOf(
+            ['edit', 'display']
+        )
+        writable: React.PropTypes.bool
+        readonly: React.PropTypes.bool
+
+    getChildContext: ->
+        context = {}
+        context.recordDisplay = if @props.editOnly or @state.isEditing then 'edit' else 'display'
+        if @props.readonly?
+            context.readonly = @props.readonly
+        if @props.writable?
+            context.writable = @props.writable
+        context
+}

data/client/lanes/react/mixins/RelayFieldChange.coffee

@@ -0,0 +1,11 @@
+Lanes.React.Mixins.RelayFieldChange = {
+
+    linkData: (data, name) ->
+        {
+            onChange: (value) ->
+                data[name] = value
+            value: ->
+                data[name]
+        }
+
+}

data/client/lanes/react/mixins/Screen.coffee

@@ -0,0 +1,7 @@
+Lanes.React.Mixins.Screen = {
+    childContextTypes:
+        screen: React.PropTypes.object
+
+    listenNetworkEvents: true
+
+}

data/client/lanes/react/mixins/Viewport.coffee

@@ -0,0 +1,11 @@
+Lanes.React.Mixins.Viewport = {
+
+    contextTypes:
+        viewport: Lanes.PropTypes.State
+
+}
+
+
+Object.defineProperty Lanes.React.Mixins.Viewport, 'viewport',
+    get: ->
+        @context.viewport

data/client/lanes/screens/ChangeListener.coffee

@@ -27,16 +27,16 @@ Lanes.Screens.ChangeListener = {
             view: 'Lanes.Views.ModelUpdate'
             collection: 'changes'
 
-    onChange: (model,change)->
+    onChange: (model,change) ->
         @changes.add(change)
         @change_count += 1
 
-    bindModel: (model)->
+    bindModel: (model) ->
         Lanes.Views.Base.prototype.bindModel.call(this, model)
         @changes.reset([])
         @change_count = 0
 
-    onChangesShow: (ev)->
+    onChangesShow: (ev) ->
         this.changes.invoke('updateTimeAgo')
         this.$('.changes-notification .scroller').animate({ scrollTop: 0 })
 

data/client/lanes/screens/Commands.coffee

@@ -0,0 +1,27 @@
+class Lanes.Screens.Commands
+
+    constructor: (@screen, @options = {}) ->
+        _.defaults(@options,
+            modelName: 'model'
+        )
+        _.bindAll(this, _.functions(this))
+
+    resetModel: ->
+        model = @getModel()
+        @setModel( new model.constructor )
+        undefined
+
+    getModel: ->
+        @screen[@options.modelName]
+
+    setModel: (model) ->
+        @screen.data.rebind("#{@options.modelName}": model)
+
+    saveModel: ->
+        @getModel().save()
+
+    toggleEdit: ->
+        @screen.setState(isEditing: !@isEditing())
+
+    isEditing: ->
+        !!@screen.state.isEditing

data/client/lanes/screens/Definitions.coffee

@@ -2,27 +2,15 @@ class ScreenView extends Lanes.Models.BasicModel
 
     session:
         screen: 'object'
+        active: ['boolean', true, true]
+        id: type: 'number', setOnce: true, required: true, default: ->
+            _.uniqueId('screen')
 
-    session:
-        active: ['boolean', true, false]
-        viewport: 'state'
-
-    derived:
-        view:
-            deps: ['screen'], fn: ->
-                if @screen?.viewModel?
-                    new @screen.viewModel( screen: this.screen, viewport: this.viewport )
-                else
-                    Lanes.warn("Undefined screen for #{this}")
+    component: ->
+        @screen.getScreen()
 
-    initialize: (options)->
-        super
-        @screen=options.screen
+    initialize: (options) ->
         Lanes.Screens.Definitions.displaying.add( this )
-        this.active=true
-
-    renderScreen: ->
-        this.view.render()
 
     remove: ->
         Lanes.Screens.Definitions.displaying.remove( this )
@@ -34,53 +22,68 @@ class ScreenDefinition extends Lanes.Models.BasicModel
     session:
         id:          'string'
         title:       'string'
+        url_prefix:  'string'
         description: 'string'
         view:        'string'
         icon:        'string'
         group_id:    'string'
         loading:     'boolean'
+        extension:   'string'
         model:       'string'
         assets:      'array'
         js:          'string'
         css:         'string'
 
     derived:
+        extension_ns:
+            deps: ['extension'], fn: ->
+                Lanes[_.classify(@extension)]
+
         model_type:
             deps: ['model'], fn: ->
-                Lanes.u.findObject(@model, "Models", this.FILE)
-
-    initialize: ->
-        @views = []
+                Lanes.u.getPath(@model) ||
+                    Lanes.u.findObject(@model, "Models", namespace: Lanes[this.extension])
+        asset_paths:
+            deps: ['assets'], fn: ->
+                prefix = if @url_prefix
+                    @url_prefix
+                else
+                    "#{@extension.toLowerCase()}/screens"
+                @assets.map (asset) -> "#{prefix}/#{asset}"
 
-    _setDisplaying: (viewport)->
-        @views.push( new ScreenView( screen: this, viewport: viewport ) )
+        extension_path:
+            deps: ['extension', 'model'], fn: ->
+                _.classify(@extension) + ".Screens." + @view
 
     getScreen: ->
-        @viewModel ||= Lanes.u.getPath(this.view,@FILE?['Views'])
-        if @viewModel?
-            _.Promise.resolve(@viewMOdel)
+        Lanes.u.getPath(@extension_path)
+
+    ensureLoaded: ->
+        if this.getScreen()
+            _.Promise.resolve(this)
         else
             this.loadScreen()
 
     loadScreen: ->
-        me=this
-        return new _.Promise( (resolve,reject)->
-             me.loading=true
-             Lanes.lib.RequestAssets(me.assets...)
-                 .then ->
-                    me.loading=false
-                    me.viewModel = Lanes.u.getPath(me.view, me.FILE?['Views'])
-                    if me.viewModel then resolve(me.viewModel)
+        me = this
+        return new _.Promise( (resolve, reject) ->
+            me.loading = true
+            Lanes.lib.RequestAssets(me.asset_paths...)
+                .then ->
+                    me.loading = false
+                    viewModel = me.getScreen()
+                    if viewModel then resolve(me)
                     else reject("Screen #{me.view} not definied after file retrieval")
-                 ,(msg)->
+                , (msg) ->
                     Lanes.warn(msg)
-                    me.loading=false
+                    me.loading = false
                     reject(msg)
         )
 
 
-    display: (ui)->
-        this.getScreen().then => @_setDisplaying(ui)
+    display: ->
+        this.ensureLoaded().then =>
+            new ScreenView( screen: @ )
 
 
 class ScreenViewSet extends Lanes.Models.BasicCollection
@@ -90,34 +93,34 @@ class ScreenViewSet extends Lanes.Models.BasicCollection
     active: ->
         @findWhere( active: true )
 
-    initialize: (models, options={})->
-        this.on( 'change:active', this.onActiveChange )
+    initialize: (models, options = {}) ->
+        this.on( 'change:active add', this.onActiveChange )
 
-    remove: (model)->
+    remove: (model) ->
         index = this.indexOf(model)
         super
         if model.active && this.length
-            this.at(_.min([index,this.length-1])).active = true
+            this.at(_.min([index, this.length - 1])).active = true
         model.active = false
         this
 
-    onActiveChange: (changed,active)->
-        return unless active
-        this.each (screen)->
+    onActiveChange: (changed, active) ->
+        return unless changed.active
+        this.each (screen) ->
             screen.set( active: false ) unless screen == changed
 
     activateNext: -> this._moveActive(+1)
     activatePrev: -> this._moveActive(-1)
 
-    _moveActive: (inc)->
+    _moveActive: (inc) ->
         return if this.length == 1
         current = this.findIndexWhere( active: true )
         return if current == -1
-        if inc>0 && current == this.length-1
+        if inc > 0 && current == this.length - 1
             current = -1
-        if inc<0 && current == 0
+        if inc < 0 && current == 0
             current = this.length
-        this.at(current+inc).active = true
+        this.at(current + inc).active = true
 
 
 
@@ -125,9 +128,9 @@ class ScreenSet extends Lanes.Models.BasicCollection
 
     model: ScreenDefinition
 
-    register: (spec)->
+    register: Lanes.emptyFn
 
-    addScreen: (screen)->
+    addScreen: (screen) ->
         screen = this.add( screen )
         screen.set(active:true)
 
@@ -142,9 +145,13 @@ class MenuGroup extends Lanes.Models.BasicModel
         icon:        'string'
         active:      ['boolean', true, false]
 
+    constructor: ->
+        super
+        Lanes.current_user.on "change:isLoggedIn", => delete @cache
+
     screens: ->
-        @avail ||= new Lanes.Models.SubCollection( Lanes.Screens.Definitions.all, {
-            filter: (screen)=>
+        @cache ||= new Lanes.Models.SubCollection( Lanes.Screens.Definitions.all, {
+            filter: (screen) =>
                 screen.group_id == @id &&
                     (!screen.model_type || Lanes.current_user.canRead(screen.model_type))
             watched: ['group_id']
@@ -152,17 +159,22 @@ class MenuGroup extends Lanes.Models.BasicModel
 
 class MenuGroupSet extends Lanes.Models.BasicCollection
 
-    constructor: -> super
     model: MenuGroup
 
+    constructor: ->
+        super
+        Lanes.current_user.on("change:isLoggedIn", =>
+            delete @cache
+        )
+
     available: ->
-        @avail ||= new Lanes.Models.SubCollection(this, {
-            filter: (mgs)=>
-                mgs.screens().filter()
-                mgs.screens().length > 0
+        @cache ||= new Lanes.Models.SubCollection(this, {
+            filter: (group) ->
+                group.screens().filter()
+                group.screens().length > 0
         })
 
-Lanes.Screens.display_id = (screen_id)->
+Lanes.Screens.display_id = (screen_id) ->
     definition = Lanes.Screens.Definitions.all.get(screen_id)
     if (definition)
         definition.display()
@@ -171,11 +183,8 @@ Lanes.Screens.display_id = (screen_id)->
 
 Lanes.Screens.Definitions = {
     all: new ScreenSet
-    displaying: new ScreenViewSet([],{ single_active_only: true })
+    displaying: new ScreenViewSet([], { single_active_only: true })
     groups:  new MenuGroupSet
-    available_groups: ->
-        MenuGroupSet.where({ id:  available.groupBy (screen)-> screen.group_id.keys })
-
-    register: (spec)->
+    register: (spec) ->
         this.all.add( spec )
 }

data/client/lanes/screens/all.js.erb

@@ -1,3 +1,3 @@
 <% Lanes::Screen.each do | screen |
-require_asset screen.js if screen.js
+   require_asset screen.url_path_for(:js)
 end %>

data/client/lanes/screens/index.js

@@ -1,6 +1,5 @@
 //= require ./ChangeListener
-//= require ./Base
-//= require ./Router
 //= require ./Definitions
 //= require ./register
+//= require ./Commands
 //= require ./mixins

data/client/lanes/screens/mixins/index.js

@@ -1 +0,0 @@
-//=require ./Editing

data/client/lanes/screens/register.js.erb

@@ -12,4 +12,3 @@ Lanes.Screens.Definitions.register( <%= spec.to_json %> );
 <% end %>
 
 <% Lanes::Screen.uncache_file_on_update(self) %>
-

data/client/lanes/screens/styles.scss

@@ -0,0 +1,7 @@
+/*
+  Intended to be included from a screen definition.
+  includes certain base variables and styles that would be useful for the screen
+*/
+@import "lanes/styles/bootstrap/variables";
+@import "lanes/styles/bootstrap/mixins";
+@import "lanes/styles/fonts";

data/client/lanes/styles/bootstrap-custom-grid.scss

@@ -43,43 +43,73 @@
 }
 
 
-// Columns
-//
-// Common styles for small and large grid columns
-
-@include make-grid-columns();
-
-
-// Extra small grid
-//
-// Columns, offsets, pushes, and pulls for extra small devices like
-// smartphones.
-
-@include make-grid(xs);
-
-
-// Small grid
-//
-// Columns, offsets, pushes, and pulls for the small device range, from phones
-// to tablets.
-.page-content.sm,.modal-dialog.sm, .modal-dialog.md, .popover-content {
-//@media (min-width: $screen-sm-min) {
-  @include make-grid(sm);
+.page-content {
+
+    // Columns
+    //
+    // Common styles for small and large grid columns
+
+    @include make-grid-columns();
+
+
+    // Extra small grid
+    //
+    // Columns, offsets, pushes, and pulls for extra small devices like
+    // smartphones.
+    @include make-grid(xs);
+
+    // Small grid
+    //
+    // Columns, offsets, pushes, and pulls for the small device range, from phones
+    // to tablets.
+
+    &.sm {
+        @include make-grid(xs);
+        @include make-grid(sm);
+    }
+
+
+    // Medium grid
+    //
+    // Columns, offsets, pushes, and pulls for the desktop device range.
+    &.md {
+        @include make-grid(xs);
+        @include make-grid(sm);
+        @include make-grid(md);
+    }
+
+    // Large grid
+    //
+    // Columns, offsets, pushes, and pulls for the large desktop device range.
+
+    &.lg{
+        @include make-grid(xs);
+        @include make-grid(sm);
+        @include make-grid(md);
+        @include make-grid(lg);
+    }
 }
 
-
-// Medium grid
-//
-// Columns, offsets, pushes, and pulls for the desktop device range.
-.page-content.md, .modal-dialog.lg {
-//@media (min-width: $screen-md-min) {
-  @include make-grid(md);
-}
-
-// Large grid
-//
-// Columns, offsets, pushes, and pulls for the large desktop device range.
-.page-content.lg  {
-/* @media (min-width: $screen-lg-min) { */
-  @include make-grid(lg);
+.modal {
+    &.lg {
+        .modal-lg {
+            @include make-grid(xs);
+            @include make-grid(sm);
+            @include make-grid(md);
+            @include make-grid(lg);
+        }
+    }
+    &.md {
+        .modal-lg {
+            @include make-grid(xs);
+            @include make-grid(sm);
+            @include make-grid(md);
+        }
+    }
+    &.sm {
+        .modal-lg {
+            @include make-grid(xs);
+            @include make-grid(sm);
+        }
+    }
 }