lanes 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b111e3e03f3c6f6a3bfffca0d087590b1ea0277a
-  data.tar.gz: ac11d9b1700311f927f06d06bcbee08de31c56e2
+  metadata.gz: 6ed648a6329d1d1b0c9ee0e5df25d1c184b5f5e0
+  data.tar.gz: 023a41ef58e894aa882ae712edb9a77b12d57d73
 SHA512:
-  metadata.gz: 3fd3233d6311c8df5041a5a39e2245f5e5099fbddde5126c8b4202e51bb79e51a25391bec8a18f9c51d13d3d34f66e7e22e5ce54a0fc88e42ea9e568bfe473ce
-  data.tar.gz: bd91444bafa49fc750fb6750071903a4856bff5ececf54c577935b55382788798f5b574f57b91fd41f56fb80bb5dece54b208fbc981e8b23f69d3519e0ce7d48
+  metadata.gz: b6cfb3a4c38ec8dd175c17047aafc03ced98e6d30ce04e48f5bd5b2550aa88521cad0ac12252a00dfdaacff9c606bd68f5d3bdccf8b5882e7b396e16c2f189e6
+  data.tar.gz: 8befe413cd47f78796a50d344ffcd89e7021ad7d4541889a67d483b0a02c41bda1b6335de7c3263a00d30124b68dc1cd091e793ceacb9c030ed695943da95468

data/Rakefile

@@ -24,7 +24,6 @@ end
 
 
 task :doc => 'db:environment' do
-    env = ENV['RAILS_ENV'] || 'development'
     ENV['SCHEMA']       = 'db/schema.rb'
     ENV['DB_STRUCTURE'] = 'db/schema.rb'
     Rake::Task["db:schema:dump"].invoke

data/client/lanes/{screens/Instance.coffee → Boot.coffee}

@@ -1,8 +1,4 @@
-Lanes.renderScreenTo = (selector, options)->
-    return new Lanes.Screens.Instance(selector, options);
-
-
-class Lanes.Screens.Instance
+class RootView
 
     constructor: (selector, options)->
         this.viewport = new Lanes.Views.Viewport({ selector: selector, instance: this })
@@ -48,3 +44,7 @@ class Lanes.Screens.Instance
         this.viewport.el = this.view.$el
         this.root.append( this.view.el )
         Lanes.Extensions.fireOnAvailable(this)
+
+
+Lanes.renderScreenTo = (selector, options)->
+    return new RootView(selector, options);

data/client/lanes/Config.coffee

@@ -4,7 +4,9 @@ class Config extends Lanes.Models.State
     session:
         csrf_token:  { type: 'string', setOnce: true }
         api_path:    { type: 'string', default: '', setOnce: true }
+        assets_path_prefix: { type: 'string', setOnce: true }
         environment: { type: 'string', setOnce: true }
+        initial_workspace_screen_id: { type: 'string', setOnce: true }
 
     derived:
         env:

data/client/lanes/components/multi-select/MultiSelect.coffee

@@ -4,6 +4,7 @@ class Lanes.Components.MultiSelect extends Lanes.Components.Base
     session:
         multiple: { type: 'boolean', default: false }
         selections: 'collection'
+        defaultID: 'integer'
         association: 'string'
         mappings: 'object'
 
@@ -11,7 +12,6 @@ class Lanes.Components.MultiSelect extends Lanes.Components.Base
         if options.model
             if options.association && ! options.field_name
                 options.field_name = options.model.associations.pk(options.association)
-
             if options.field_name
                 listener = {}
                 listener["change:#{options.field_name}"] ='onModelAttributeChange'
@@ -26,11 +26,25 @@ class Lanes.Components.MultiSelect extends Lanes.Components.Base
         if options.choices
             @selections ||= options.choices
 
-        @selections?.ensureLoaded?()
+        @selections?.ensureLoaded?().then =>
+            @selectDefault()
 
         @mappings = _.extend({
-            id: 'id', title: 'title', selected: 'selected'
+            id: 'id', title: 'code', selected: 'selected'
         },options.mappings||{})
+        if @association && !@defaultID
+            pk = options.model[ options.model.associations.pk(this.association) ]
+            @defaultID ||= pk
+
+    selectDefault: ->
+        if @defaultID
+            selection = this.selectionForID(@defaultID)
+        else
+            selection = _.result(this.selections,'first')
+        this.select(selection) if selection
+
+    onRender: ->
+        this.selectDefault()
 
     unSelectAll: ->
         this.$el.find(":selected").prop('selected',false)
@@ -46,6 +60,6 @@ class Lanes.Components.MultiSelect extends Lanes.Components.Base
 
     onModelAttributeChange: (model,fkids)->
         if ! this.el.binding_is_setting
-            _.each(fkids, (fkid)=>
-                @select( @selectionForID( fkid )  )
-            )
+            fkids = [fkids] unless _.isArray(fkids)
+            for fkid in fkids
+                this.select(selection) if selection=this.selectionForID( fkid )

data/client/lanes/components/popover/PopOver.coffee

@@ -40,7 +40,9 @@ class Lanes.Components.PopOver extends Lanes.Components.Base
         return this.notification.promise
 
     destroy: ->
+        this.isDestroying = true
         this.target.popover('destroy')
+        this.remove()
 
     hide:->
         this.target.popover('hide')
@@ -48,5 +50,6 @@ class Lanes.Components.PopOver extends Lanes.Components.Base
         this.destroy()
 
     _onHide: (ev)->
-        this.notification.resolve(this)
-        this.destroy() if this.destroyAfterHide
+        this.notification?.resolve(this)
+        if this.destroyAfterHide && !this.isDestroying
+            this.destroy()

data/client/lanes/components/record-finder/RecordFinder.coffee

@@ -37,20 +37,25 @@ class Lanes.Components.RecordFinder extends Lanes.Components.Base
             dlg.remove().record
         ).then( (record)=>
             if record
-                if @withAssociations then record.withAssociations(@withAssociations...) else record
+                if _.isEmpty(@withAssociations)
+                    record.fetch()
+                else
+                    record.withAssociations(@withAssociations...)
             else
                 null
-        ).then( (record)=>
-            @.$el.trigger("display-record", record) if record
+        ).then( (reply)=>
+            @.$el.trigger("display-record", reply.record) if reply?.record
         , (e)->Lanes.warn(e) )
 
     onKey: (ev)->
         if 13 == ev.keyCode
-            this.runQuery(ev)
+            code = this.$(ev.target).val()
+            this.loadCode(code)
         else if @invalid_chars && @ui.input.val().match( @invalid_chars )
             @ui.input.val( @ui.input.val().replace( @invalid_chars, '' ) )
 
-    runQuery: (ev)->
-        code = this.$(ev.target).val()
+    loadCode: (code)->
         @recordQuery.loadSingle(code.toUpperCase(),{ include: @withAssociations })
-            .then( (reply)=> this.$el.trigger("display-record", reply.record) if reply.record )
+            .then( (reply)=>
+                this.$el.trigger("display-record", reply.record) if reply.record
+            )

data/client/lanes/components/record-finder/config.json

@@ -1,3 +1,3 @@
 {
-    "depends": ["radio-group"]
+    "depends": ["radio-group", "modal", "grid"]
 }

data/client/lanes/components/select-field/SelectField.coffee

@@ -17,7 +17,6 @@ class SelectOption extends Lanes.Views.Base
 
 class Lanes.Components.SelectField extends Lanes.Components.MultiSelect
 
-
     subviews:
         fields:
             hook: 'choices-input'
@@ -39,10 +38,8 @@ class Lanes.Components.SelectField extends Lanes.Components.MultiSelect
 
     onSelectChange: (ev)->
         if @model && @association
-            @model.set(@association, this.selectionForID( this.ui.select.val() ))
-
-    constructor: (options={})->
-        super
+            selection = this.selectionForID(parseInt(this.ui.select.val()))
+            @model.set(@association, selection) if selection
 
     writeTemplate: ->
         multiple = if this.multiple then "multiple" else ""
@@ -51,13 +48,16 @@ class Lanes.Components.SelectField extends Lanes.Components.MultiSelect
     readTemplate: ->
         "<div class='ro-input' name='#{this.field_name}'></div>"
 
-
     select: (option)->
         if this.readOnly
-            this.$el.text( if option then option.code else "" )
+            this.$el.text( if option then option[@mappings.title] else "" )
         else if option
             id = option.get(@mappings.id)
             option = this.query("option[value=\"#{id}\"]")
-            option.selected = true
+            if option
+                if option.selected
+                    this.onSelectChange() # force event to fire
+                else
+                    option.selected = true
         else
             this.unSelectAll()

data/client/lanes/index.js

@@ -10,3 +10,4 @@
 //= require ./components/enabled
 //= require ./screens
 //= require ./extension/LateLoaded
+//= require ./Boot

data/client/lanes/index.scss.erb

@@ -22,7 +22,7 @@
 <% if !Lanes.config.initial_workspace_screen_id.blank? &&
       screen = Lanes::Screen[Lanes.config.initial_workspace_screen_id]
 %>
-  @import "<%= screen.css.remove(/\.css$/) + "/index.scss" %>"
+  @import "<%= screen.css.remove(/\.css$/) + "/index.scss" %>";
 <% end %>
 
   @import "styles/plugins/all"

data/client/lanes/lib/MakeBaseClass.coffee

@@ -1,3 +1,15 @@
+# Hack in support for Function.name for IE
+if Function::name == undefined && Object.defineProperty != undefined
+    Object.defineProperty(Function.prototype, 'name', {
+        get: ->
+            funcNameRegex = /function\s([^(]{1,})\(/;
+            results = (funcNameRegex).exec((this).toString())
+            return if (results && results.length > 1) then results[1].trim() else ""
+
+        set: Lanes.emptyFn
+    })
+
+
 mixinModules = (klass)->
     Lanes.lib.ModuleSupport.includeInto(klass)
     if klass::mixins

data/client/lanes/lib/loader.coffee

@@ -86,8 +86,10 @@ class Loader
         this.body.appendChild(node)
 
 
-Lanes.lib.Request = (urls...)->
+Lanes.lib.RequestAssets = (urls...)->
     urls = urls[0] if urls.length == 1 && _.isArray(urls[0])
+    for url,i in urls
+        urls[i] = Lanes.config.assets_path_prefix.concat( '/', urls[i] )
     new _.Promise(  (resolve,reject)->
         new Loader(urls, (completed)->
             failures = _.pick(completed, (status,url)-> !status.success )

data/client/lanes/lib/namespace.coffee

@@ -8,5 +8,5 @@ Lanes.namespace = (target, name, block) ->
     target = target[item] or= {} for item in name.split '.'
     block( target, top ) if typeof block == 'function'
 
-for ns in ['Components', 'Models.Mixins', 'Views.Mixins', 'Screens', 'Vendor', 'Templates', 'Extensions','lib']
+for ns in ['Components', 'Models.Mixins', 'Views.Mixins', 'Screens.Mixins', 'Vendor', 'Templates', 'Extensions','lib']
     Lanes.namespace(ns)

data/client/lanes/lib/utilFunctions.coffee

@@ -38,13 +38,25 @@ Lanes.u = {
         else
             file.namespace[subPath]?[name] || Lanes[subPath]?[name] || Lanes.u.getPath(name)
 
+    #
+    findRelative: (name, file)->
+        parts = _.map(file.path.slice(0, file.path.length - 1), (comp)->
+            _.classify(comp);
+        )
+        obj = _.reduce( parts, ( ( memo, val )-> return if memo then memo[ val ] else null ), Lanes )
+        obj?[name]
+
     # Can be called one of two ways:
     # With ns being a string, which will attempt to deref it then deref name inside it
     # or with ns being an object, which will dref name inside it
     getPath: ( name, ns='Lanes' ) ->
         return name unless _.isString(name)
         ns = "Lanes.#{ns}" if _.isString(ns) && !ns.match("Lanes")
-        distillTypes(name, window) || distillTypes(name, if _.isObject(ns) then ns else distillTypes(ns, window) )
+        object = distillTypes(name, window)
+        if ! object
+            ns=if _.isObject(ns) then ns else distillTypes(ns, window)
+            object=distillTypes(name, ns )
+        object
 
     # Like underscore's results but allows passing
     # arguments to the function if it's called

data/client/lanes/models/{ModelAssociations.coffee → AssociationMap.coffee}

@@ -23,7 +23,7 @@ class Lanes.Models.AssocationMap
             _.extend(options, Lanes.u.resultsFor(model,definition.options))
         options
 
-    # will be called in the scope of the model
+    # will be called in the scope of the parent model
     createModel: (association, name, definition, fk, pk, target_class)->
         target_class ||= association.getClassFor(name)
         options = association.getOptions(name,definition,this)
@@ -33,7 +33,7 @@ class Lanes.Models.AssocationMap
         else
             target_class.findOrCreate(options)
 
-    # will be called in the scope of the model
+    # will be called in the scope of the parent model
     createCollection: (association, name, definition, fk, pk, target_class)->
         target_class ||= association.getClassFor(name)
         options = association.getOptions(name,definition,this)
@@ -47,11 +47,13 @@ class Lanes.Models.AssocationMap
             new Lanes.Models.AssociationCollection(options.models||[],options)
     # returns the definition for the derived property
     derivedDefinition: (name,definition)->
-        createFn = _.partial(
-            if definition.model then this.createModel else this.createCollection,
-            this, name, definition, this.fk(name), this.pk(name)
-        )
-        { deps: [this.pk(name)], fn: createFn }
+        defaultCreator=if definition.model then this.createModel else this.createCollection
+        args = [ this, name, definition, this.fk(name), this.pk(name) ]
+        createFn = if definition.default
+            -> definition.default.apply(this,args) || defaultCreator.apply(this,args)
+        else
+            defaultCreator
+        { deps: [this.pk(name)], fn: _.partial(createFn, args...) }
 
 
     # Sets the assocations for "model"
@@ -68,8 +70,9 @@ class Lanes.Models.AssocationMap
                 association = model[name]
                 association[fn_name]( attributes )
                 # if we're replaceing the model's contents with another, copy the dirty status as well
-                if association.isModel && value.isModel
-                    association.isDirty = value.isDirty
+                if association.isModel
+                    model.set(this.pk(name), association.id) unless association.isNew
+                    association.isDirty = value.isDirty if value.isModel
 
     pk: (name)->
         def = @definitions[name]

data/client/lanes/models/Base.coffee

@@ -1,3 +1,9 @@
+# These prototype properties are also
+# set on any Collections that are created
+PROPERTIES_SHARED_WITH_DEFAULT_COLLECTION = [
+    'cacheDuration'
+]
+
 # Da Model. Handles all things dataish
 class BaseModel
     isModel: true
@@ -89,15 +95,15 @@ class BaseModel
         if _.isString(options)
             names.push(options); options={}
         scope = options.scope || this
-        needed = this.associations.nonLoaded(this,names)
+        needed = this.associations?.nonLoaded(this,names)
         if _.isEmpty( needed )
             options.success.call(scope, this  ) if options.success
             options.complete.call(scope,this  ) if options.complete
-            return _.Promise.resolve(this)
+            return _.Promise.resolve({record:this,reply:{}})
         else
             options['include']=needed
             this.fetch(options)
-                .then (req)-> req.record
+
 
     # Searches the PubSub idenity map for a record of the same type and matching id
     # If one is found, it will update it with the given attributes and return it
@@ -131,6 +137,7 @@ class BaseModel
     @fetchById: (id, options={})->
         record = new this(id: id)
         record.fetch(options)
+        record
 
     # Sets the attribute data from a server respose
     setFromServer: (data,options)->
@@ -160,11 +167,14 @@ class BaseModel
     # Fetch the model from the server. If the server's representation of the
     # model differs from its current attributes, they will be overridden,
     # triggering a `"change"` event.
-    fetch:  (options={}) ->
-        options = _.clone(options)
+    fetch:  (original_options={}) ->
+        options = _.clone(original_options)
         handlers = Lanes.Models.Sync.wrapRequest(this,options)
-        _.extend(options,{limit:1,ignoreUnsaved:true})
-        this.sync('read', this, options)
+        if this.cacheDuration && _.isEmpty(original_options)
+            Lanes.Models.ServerCache.fetchRecord(this, options)
+        else
+            _.extend(options,{limit:1,ignoreUnsaved:true})
+            this.sync('read', this, options)
         handlers.promise
 
     @fetch: (options={})->
@@ -200,7 +210,7 @@ class BaseModel
     # all data is returned.  Otherwise only unsaved attributes (and associations)
     # are returned.
     dataForSave: (options={})->
-        if options.saveAll
+        if options.saveAll || this.isNew()
             data = this.getAttributes(props:true, true)
         else
             data = this.unsavedAttributes()
@@ -209,7 +219,7 @@ class BaseModel
         data
 
 
-    # True if the model has "name" as eitehr a prop or session attribute
+    # True if the model has "name" as either a prop or session attribute
     hasAttribute: (name)->
         !! (this._definition[name] || this._derived[name])
 
@@ -231,11 +241,23 @@ class BaseModel
             klass::associations = new Lanes.Models.AssocationMap(klass)
 
     @afterExtended: (klass)->
-        if !klass::abstractClass && !klass.Collection
-            class DefaultCollection
-                constructor: -> super
-                model: klass
-            klass.Collection = Lanes.Models.Collection.extend(DefaultCollection)
+        return if klass::abstractClass
+        unless klass.Collection
+            @createDefaultCollectionFor(klass)
+
+        if klass::enums
+            klass::enums = new Lanes.Models.EnumMap(klass)
+
+
+    @createDefaultCollectionFor: (klass)->
+        name = "#{klass.name}Collection"
+        Collection = new Function("return function #{name}(){
+            #{name}.__super__.constructor.apply(this, arguments);
+        }")()
+        Collection::model = klass
+        for prop in PROPERTIES_SHARED_WITH_DEFAULT_COLLECTION
+            Collection::[prop] = klass::[prop] if klass::[prop]
+        klass.Collection = Lanes.Models.Collection.extend(Collection)
 
     Lanes.lib.ModuleSupport.includeInto(@)
     @include Lanes.lib.results
@@ -269,6 +291,10 @@ class BasicModel
     setFromView: (key,value)->
         this.set(key,value)
 
+    # True if the model has "name" as eitehr a prop or session attribute
+    hasAttribute: (name)->
+        !! (this._definition[name] || this._derived[name])
+
 Lanes.Models.BasicModel = State.extend( BasicModel )
 
 Lanes.Models.Base = BasicModel.extend( BaseModel )

data/client/lanes/models/Collection.coffee

@@ -49,12 +49,16 @@ class ModelsCollection
     # current models whith them when the call completes
     fetch: (options={})->
         handlers = Lanes.Models.Sync.wrapRequest(this,options)
-        this.sync('read', this, options)
+        if this.cacheDuration
+            Lanes.Models.ServerCache.fetchCollection(this, options)
+        else
+            this.sync('read', this, options)
         handlers.promise
+
     ensureLoaded: (options={})->
         handlers = Lanes.Models.Sync.wrapRequest(this,options)
         if options.force || (!@_isLoaded && !this.length )
-            this.sync('read', this, options)
+            this.fetch(options)
         else
             handlers.resolvePromise( record: this, reply: {} )
         handlers.promise

data/client/lanes/models/EnumMap.coffee

@@ -0,0 +1,25 @@
+# ------------------------------------------------------------------ #
+# Handles Enum definitions.                                          #
+# It creates a helper methods for each one                           #
+# and contains utility functions to operate on them                  #
+# ------------------------------------------------------------------ #
+class Lanes.Models.EnumMap
+    constructor: (@klass)->
+        @enums = _.clone(@klass::enums)
+        for enum_name, def of @enums
+            this.defineAccessor(enum_name, _.invert(def))
+            for name, id of def
+                this.defineEnumHelper(enum_name, name, id)
+
+    defineAccessor: (name, values)->
+        Object.defineProperty(@klass.prototype, "#{name}_value", {
+            get: ->
+                values[this.get(name)]
+        })
+
+    defineEnumHelper: (enum_name, name, id)->
+        Object.defineProperty(@klass.prototype, "is_#{name}", {
+            set: Lanes.emptyFn
+            get: ->
+                this[enum_name] == id
+        })

data/client/lanes/models/PubSub.coffee

@@ -44,11 +44,11 @@ Lanes.Models.PubSub = {
     forModel: (model)->
 
     add: (model)->
-        return unless model.isPersistent()
+        return unless model.isPersistent?()
         @types.forModel(model).add(model)
 
     remove: (model)->
-        return unless model && model.isPersistent()
+        return unless model && model.isPersistent?()
         @types.forModel(model).remove(model)
 
     instanceFor: ( model_klass, id )->

data/client/lanes/models/Query.coffee

@@ -177,7 +177,7 @@ class Lanes.Models.Query extends Lanes.Models.Base
 
     loadSingle: (code,options)->
         options.query = {}
-        options.query[ @initialField ] = code
+        options.query[ @initialField.id ] = code
         @modelClass.fetch(options)
 
     defaultField: ->

data/client/lanes/models/ServerCache.coffee

@@ -0,0 +1,63 @@
+class CacheEntry
+
+    constructor: (@collection, @options, @key)->
+        @duration = Lanes.Vendor.Moment.duration(@collection.cacheDuration...)
+        _.bindAll(this,'setFromServer')
+        @successCallback = @options.success
+        @options.success = this.setFromServer
+        Lanes.Models.Sync.perform('read', this, @options)
+
+    url: ->
+        _.result(@collection,'url')
+
+    setFromServer: (reply, status, req)->
+        if reply?.data?
+            Lanes.Models.ServerCache.store(@key, reply.data, @duration.asMilliseconds())
+        @successCallback?.apply(@options.scope, arguments)
+
+    # # needed to
+    # trigger: (type, model, xhr, options)->
+    #     @collection.trigger(type, @collection, xhr, options)
+
+
+Lanes.Models.ServerCache = {
+    CACHE: {}
+
+    store: (key, data, ms)->
+        this.CACHE[key] = data
+        setTimeout(->
+            delete Lanes.Models.ServerCache.CACHE[key]
+        , ms)
+
+    computeCacheKey: (collection, options)->
+        url = _.result(collection, "url")
+        query = {}
+        for key, value of options
+            query[ Lanes.Models.Sync.paramsMap[key] ] = value if Lanes.Models.Sync.paramsMap[key]
+        url + Lanes.$.param(query)
+
+    fetchRecord: (record, options)->
+        key = record.urlRoot()
+
+        if data_set=this.CACHE[key]
+            found = false
+            for data in data_set
+                if record.id == data.id
+                    found = data
+                    break
+        if data_set && found
+            options.success.call(options.scope, {data: found}, "sucess", {})
+        else
+            this.sync('read', this, options)
+
+        false
+
+    fetchCollection: (collection, options)->
+        key = this.computeCacheKey(collection, options)
+        if this.CACHE[key]
+            collection.setFromServer(this.CACHE[key], options)
+            options.success.call(options.scope, {data: this.CACHE[key]}, "sucess", {})
+        else
+            new CacheEntry(collection,options, key)
+
+}

data/client/lanes/models/Sync.coffee

@@ -15,19 +15,17 @@ getValue = (object, prop)->
 
 
 
-
-paramsMap = {
-    fields  : 'f'
-    with    : 'w'
-    query   : 'q'
-    include : 'i'
-    order   : 'o'
-    limit   : 'l'
-    start   : 's'
-    format  : 'df'
-}
-
 Lanes.Models.Sync = {
+    paramsMap:
+        fields  : 'f'
+        with    : 'w'
+        query   : 'q'
+        include : 'i'
+        order   : 'o'
+        limit   : 'l'
+        start   : 's'
+        format  : 'df'
+
     urlError: ->
         throw new Error('A "url" property or function must be specified')
 
@@ -65,7 +63,7 @@ Lanes.Models.Sync = {
     perform: (method, model, options={})->
         query = {}
         for key, value of options
-            query[ paramsMap[key] ] = value if paramsMap[key]
+            query[ this.paramsMap[key] ] = value if this.paramsMap[key]
 
         # Default JSON-request options.
         params = {

data/client/lanes/models/index.js

@@ -1,6 +1,8 @@
 //= require_self
 //= require ./Sync
-//= require ./ModelAssociations
+//= require ./ServerCache
+//= require ./AssociationMap
+//= require ./EnumMap
 //= require ./Base
 //= require ./Collection
 //= require_tree ./mixins

data/client/lanes/screens/Base.coffee

@@ -10,7 +10,7 @@ class ScreenBase
     mixins:[
         Lanes.Screens.ChangeListener
     ]
-
+    formBindings: true
     reset: Lanes.emptyFn
 
     templateName: 'layout'

data/client/lanes/screens/Definitions.coffee

@@ -66,7 +66,7 @@ class ScreenDefinition extends Lanes.Models.BasicModel
         me=this
         return new _.Promise( (resolve,reject)->
              me.loading=true
-             Lanes.lib.Request(me.assets)
+             Lanes.lib.RequestAssets(me.assets...)
                  .then ->
                     me.loading=false
                     me.viewModel = Lanes.u.getPath(me.view, me.FILE?['Views'])