ende 0.4.25 → 0.5.0

data/lib/assets/javascripts/aura/extensions/widget/composable.js.coffee

@@ -32,7 +32,6 @@ define 'aura/extensions/widget/composable', ->
       for advice in advices
 
         # in order to preserve declaration order, we must reverse the callbacks order
-        # TODO rename advice.name to advice.type
         advice.callbacks.reverse() if advice.name == 'before'
 
         # Advice with all callbacks
@@ -43,44 +42,28 @@ define 'aura/extensions/widget/composable', ->
     advisor.advisable = (factory) ->
       original = factory.compose
 
-      compose_advices = (advices, composed_advices = {}) ->
-        for advice in advices
-          composed_advices[advice.key] ||= []
-          composed_advices[advice.key] = composed_advices[advice.key].concat advice.callbacks
-
-        composed_advices
-
-      composable_advices  = (stamps...) ->
-        advices = []
-        for stamped in stamps
-          {fixed: {methods: stamp_methods}} = stamped
-          advices = advices.concat extract_advices stamp_methods
+      stamp.mixIn factory,
+        compose: (stamps...) ->
+          {fixed: {methods: composition_methods}} = @composition
+          advices = extract_advices composition_methods
 
-        # Create a ultimate stamp with all advices arrays or functions
-        # merged, that will ultimatly override the prototype chain
-        # definitions
-        #
-        # TODO do not store advices definitions in the prototype chain
-        stamps.push stamp compose_advices advices
+          for stamped in stamps
+            {fixed: {methods: stamp_methods}} = stamped
+            advices = advices.concat extract_advices stamp_methods
 
-        stamps
+          adviced_stamp = {}
+          for advice in advices
+            adviced_stamp[advice.key] ||= []
+            adviced_stamp[advice.key] = adviced_stamp[advice.key].concat advice.callbacks
 
-      # Move current factory composition advices to a composable form
-      # {fixed: {methods: composition_methods}} = factory.composition
-      # compose_advices extract_advices(composition_methods), composition_methods
+          # Create a ultimate stamp with all advices arrays or functions merged
+          # TODO do not store advices definitions in the prototype chain
+          stamps.push stamp adviced_stamp
 
-      stamp.mixIn factory,
-        compose: (stamps...) ->
-          stamps.unshift factory.composition
-          original.apply factory, composable_advices stamps...
+          original.apply factory, stamps
 
         advice: advisor.advice
 
-
-    composable = advisor.composable
-    advisor.composable = ->
-      advisor.advisable composable.apply advisor, arguments
-
     advisor
 
   composerable = (compositor) ->
@@ -120,8 +103,8 @@ define 'aura/extensions/widget/composable', ->
             methods = extend methods, fixed.methods, definition_methods or definition
             state   = extend state  , fixed.state  , definition_state
 
-            initializers = initializers.concat fixed.enclose      if fixed.enclose
-            initializers = initializers.concat definition.enclose if definition.enclose
+            initializers.push fixed.enclose      if fixed.enclose
+            initializers.push definition.enclose if definition.enclose
 
           enclosed = (properties) ->
             initializers.forEach (initializer) => initializer.call @, properties
@@ -138,7 +121,7 @@ define 'aura/extensions/widget/composable', ->
 
     {core: {Widgets, util: {extend}, stamp}} = application
 
-    Widgets = advisorable composerable Widgets
+    Widgets = composerable advisorable Widgets
 
     # THINK how to at the same time respect aura ways of instantiating
     # widgets and preserve widget logic composability

data/lib/assets/javascripts/config/load_components.js.coffee

@@ -26,6 +26,8 @@ define 'modernizr' , ['config/load_components'], ->
   require 'modernizr'
   window.Modernizr
 
+define 'rivets', ['config/load_components'], -> require 'rivets'
+
 # TODO define 'underscore', ['config/load_components'], -> require 'lodash'
 
 # TODO figure out how to use rjs optmizer to include component builds
@@ -121,8 +123,8 @@ define 'config/load_components', ['application_components'], ->
       using = loader.discover params...
 
       try
-
-        module = loader.loaders.discovered.apply @, params
+        # TODO rename mod to module
+        mod = loader.loaders.discovered.apply @, params
 
       catch e
         if e.require
@@ -132,15 +134,15 @@ define 'config/load_components', ['application_components'], ->
 
           # Since it failed to load with component, try to load with requirejs
           loader.activate 'requirejs'
-          unless module
-            module = loader.loaders.discovered.apply @, params
+          unless mod
+            mod = loader.loaders.discovered.apply @, params
         else
           throw e
 
         # Always let requirejs active by default
       loader.activate 'requirejs'
 
-      module
+      mod
 
   loader.shim()
   loader.initialize()

data/lib/assets/javascripts/widgets/attachable/main.js.coffee

@@ -0,0 +1,77 @@
+define ->
+
+  # TODO create diferent type for non-ui composable widgets
+  # TODO think about how to make this widget dependent on eventable extension
+  # TODO move this widtet to an extension when element is stored in the sandbox
+  type: 'Base'
+
+  version: '0.1.0'
+
+  # TODO options: {state: 'reset' # Will preserve initial widget state }
+
+  initialize: (options) ->
+
+    @sandbox._attachments = []
+
+    @$el.addClass "widget #{@name} composing"
+
+    # TODO think how to extend widgets as a way of knowing all children have started
+    @compose_when_parent()
+
+  # TODO think how to extend widgets as a way of knowing all children have started
+  compose_when_parent: ->
+    @interval = setInterval =>
+      if @sandbox._parent?
+        @compose @sandbox._parent._widget
+        clearInterval @interval
+    , 800
+
+  # Create a widget type to replace @$el for a html comment
+  compose: (parent) ->
+    @parent = parent
+    parent_namespace = parent.name + '.' + parent.identifier
+
+    # TODO move to elementless widgets
+    @transform_into_elementless()
+
+    @sandbox.on "#{parent_namespace}.reattach", @reattach, @
+    @sandbox.on "#{parent_namespace}.detach"  , @detach  , @
+    @sandbox.on "#{parent_namespace}.attach"  , @attach  , @
+
+  transform_into_elementless: ->
+    serializable_options = _.omit @options, '$el', 'el', 'ref', '_ref', 'require', 'baseUrl'
+
+    marker  = " #{@name}.#{@identifier} for #{@parent.name}.#{parent.identifier}"
+    marker += " with #{JSON.stringify serializable_options} "
+    node    = document.createComment marker
+    @$el.replaceWith node
+
+    @$el = $ node
+
+  reattach: (selector) ->
+    @detach()
+    @attach selector
+
+  detach: ->
+    @sandbox.stopListening()
+    # TODO Support multiple deatachments events storage
+    current_events   = @sandbox._events
+    @sandbox._events = @sandbox._attachments.shift() || []
+    @sandbox._attachments.push current_events
+
+    # TODO unbind and store jquery handlers
+    # TODO store element position in the attachment
+    @parent.$el.detach()
+
+  attach: (selector) ->
+    element = @sandbox.dom.find selector
+    @sandbox.logger.error "attach: No element found for #{selector} for attachment" unless element.length
+
+    # TODO Support multiple deatachments events storage
+    @sandbox._attachments.push @sandbox._events
+    @sandbox._events = @sandbox._attachments.shift() || []
+    @sandbox.startListening()
+
+    # TODO rebind jquery handlers
+    # TODO restore element position of the attachment
+    element.append @parent.$el

data/lib/assets/javascripts/widgets/list/presenter.js.coffee

@@ -1,13 +1,13 @@
 'use strict'
-observable = require('indefinido-observable').mixin
 
-define (model) ->
+define ->
 
   (items, luna) ->
 
     resource = items[0].resource
 
-    searcher: observable
+    # TODO create view_model
+    searcher:
       query: ''
       search: (event, models) ->
 
@@ -22,8 +22,7 @@ define (model) ->
 
         false
 
-    # TODO create view_model
-    list: observable Object.create null,
+    list: Object.create null,
       resource:
         set: (resource) -> null
         get: -> resource

data/lib/assets/javascripts/widgets/support/adapters/olark.js

@@ -114,7 +114,7 @@ define(function () {
         update_user: function (user) {
            user.email && olark('api.visitor.updateEmailAddress', {emailAddress: user.email});
            user.name  && olark('api.visitor.updateFullName'    , {fullName: user.name});
-           user.phone && olark('api.visitor.updatePhoneNumber' , {phoneNumber: user.phone});
+           user.phone.toString() && olark('api.visitor.updatePhoneNumber' , {phoneNumber: user.phone.toString()});
            // TODO rename user._id to user.id
            user._id   && olark('api.visitor.updateCustomFields', {id: user._id});
         }

data/lib/assets/javascripts/widgets/tray/main.js.coffee

@@ -1,24 +1,22 @@
-define ->
+'use strict'
 
-  'use strict'
+define
 
   type: 'Base'
 
   version: '0.1.2'
 
   initialize: (options) ->
-    names = []
     {identifier} = options
+    @names = []
 
-    # TODO access omit method throuhgh underscore
+    # TODO access omit method throuhgh sandbox
     widget_options =  _.omit options, 'el', 'ref', '_ref', 'name', 'require', 'baseUrl', 'resource'
 
     # TODO remove jquery dependency
-    for name, suboptions of widget_options when $.type(suboptions) is "object"
-      names.push suboptions.name || name
-      @add suboptions.name || name, suboptions
+    injections = @prepare_injections widget_options
 
-    @$el.addClass ['tray', 'widget'].concat(names).join(' ')
+    @$el.addClass ['tray', 'widget'].concat(@names).join(' ')
 
     @identifier ||= identifier
 
@@ -27,13 +25,21 @@ define ->
       @identifier = identifier
       @$el.attr 'id', identifier
 
-    @sandbox.start()
+    # TODO get defer through sandbox
+    _.defer =>
+      @sandbox.start injections
+
+  prepare_injections: (widget_options) ->
+    # TODO remove jquery dependency, and use type detection through sandbox
+    for name, suboptions of widget_options when $.type(suboptions) is "object"
+      @names.push suboptions.name || name
+
+      # TODO do not allow elements outside of the tray
+      # TODO remove jquery dependency, and use documentFragment to build widgets
+      # TODO allow widgets without elements
+      @$el.append suboptions.el = jQuery '<div class="widget"></div>'
 
-  add: (name, options) ->
+      @injection
+        name: suboptions.name || name
+        options: suboptions
 
-    # TODO add widgets as childrens of the tray widget sandbox
-    # TODO remove jquery dependency, and use documentFragment to build widgets
-    element     = jQuery '<div class="widget"></div>'
-    options.el  = element
-    @$el.append   element
-    @inject name, options

data/lib/assets/javascripts/widgets/viewer/main.js.coffee

@@ -256,6 +256,9 @@ define [
       # use it here instead of overriding all records
       viewer.items = records
 
+      # Start widgets created by bindings
+      @syncronize_children()
+
     @fetching.done (records) =>
       if viewer.items.length
         # boo.initialize @$el.find '.results .items'
@@ -322,14 +325,7 @@ define [
 
       # TODO move binders to application
       @inherit_parent_presentation()
-      # TODO on bind execute presentation_options method and extend and inherit from presenter what needed
-      @bind @presentation, @sandbox.util.extend(true, @presenter.presentation, @options.presentation)
-
-      @presentation.viewer.subscribe 'items', =>
-        # Start possible widgets created by items with widget
-        # instantiation markup
-        @syncronize_children()
-
+      @bind @presentation, @presenter.presentation
 
       # Start widgets that may have been created by bindings
       @sandbox.emit 'aura.sandbox.start', @sandbox

data/lib/assets/javascripts/widgets/viewer/plugins/scopable.js.coffee

@@ -1,11 +1,6 @@
 'use strict';
 
-window.domo = []
-
-# TODO define componentjs required packages, as requirejs packages
-observable   = require('indefinido-observable').mixin
-
-define ['stampit/stampit'], (stampit) ->
+define ['stampit/stampit', 'observable'], (stampit, observable) ->
 
   scopingable = stampit
     start: ->
@@ -42,7 +37,6 @@ define ['stampit/stampit'], (stampit) ->
     @
 
 
-
   scopable = stampit
     forward_scope_data: (scope_name, data) ->
       switch @scope['$' + scope_name].constructor

data/lib/ende/version.rb

@@ -1,3 +1,3 @@
 module Ende
-  VERSION = "0.4.25"
+  VERSION = "0.5.0"
 end