ende 0.4.20 → 0.4.21

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

@@ -1,22 +1,24 @@
-'use strict'
+define ->
 
-define
+  'use strict'
 
   type: 'Base'
 
   version: '0.1.2'
 
   initialize: (options) ->
+    names = []
     {identifier} = options
-    @names = []
 
-    # TODO access omit method throuhgh sandbox
+    # TODO access omit method throuhgh underscore
     widget_options =  _.omit options, 'el', 'ref', '_ref', 'name', 'require', 'baseUrl', 'resource'
 
     # TODO remove jquery dependency
-    injections = @prepare_injections widget_options
+    for name, suboptions of widget_options when $.type(suboptions) is "object"
+      names.push suboptions.name || name
+      @add suboptions.name || name, suboptions
 
-    @$el.addClass ['tray', 'widget'].concat(@names).join(' ')
+    @$el.addClass ['tray', 'widget'].concat(names).join(' ')
 
     @identifier ||= identifier
 
@@ -25,21 +27,13 @@ define
       @identifier = identifier
       @$el.attr 'id', identifier
 
-    # 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>'
+    @sandbox.start()
 
-      @injection
-        name: suboptions.name || name
-        options: suboptions
+  add: (name, options) ->
 
+    # 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

@@ -1,13 +1,14 @@
+
 'use strict';
 
-lazy_require = 'advisable'
+lazy_requires = ['observable', 'advisable']
 define [
   './states/index',
   './presenters/default',
   'jquery.inview',
   'stampit/stampit',
-  'observable',
-  lazy_require], (templates, presenter, inview, stampit, observable, advisable) ->
+  lazy_requires[0],
+  lazy_requires[1]], (templates, presenter, inview, stampit, observable, advisable) ->
 
   scopable = (widget) ->
     deferred = widget.sandbox.data.deferred()
@@ -29,7 +30,6 @@ define [
 
       return unless total_pages?
 
-      # TODO set default abortion to decreatse page numbers amount
       scope.page ++page_number
 
       if page_number <= total_pages
@@ -126,32 +126,7 @@ define [
     viewed: (event, in_view, horizontal, vertical) ->
       boo[if in_view then 'pride' else 'shame'] event.target
 
-
-  # TODO Move each handler to independent features
-  handleable = stampit
-    handleables:
-      item:
-        hover: (event, models) ->
-          if event.type == 'mouseenter'
-            @hover models.item
-          else if event.type == 'mouseleave'
-            @hover null
-          else
-            throw new TypeError 'viewer.handlers.hover: Event type incompatible with hovering.'
-
-        clicked: (event, models) -> @select models.item
-
-  , {}, ->
-
-    throw new TypeError "Widget property is mandatory for handleable stamp" unless @widget?
-
-    @handlers =
-      item:
-        clicked: $.proxy @handleables.item.clicked, @widget
-        hover  : $.proxy @handleables.item.hover  , @widget
-
-    @
-  version: '0.2.4'
+  version: '0.2.1'
 
   # TODO better separation of concerns
   # TODO Current remote page that is beign displayed
@@ -182,16 +157,8 @@ define [
     # We extend presentation.selected just to assign all values of the item model
     # TODO call presenter to do this job
     @sandbox.util.extend @presentation.selected   , item.model.json?() || item.model
-
-    # TODO change paramters to item, item.model
     @sandbox.emit "viewer.#{@identifier}.selected", item.model
 
-  # Called when hover in and out from model
-  hover: (item) ->
-    # TODO call presenter to do this job
-    # @sandbox.util.extend @presentation.hovered   , item.model.json?() || item.model
-    @sandbox.emit "viewer.#{@identifier}.hovered", item, item && item.model
-
   scope_to: (scope, child_scope) ->
     # Singuralize in order to accept association scopes, since
     # association scopes return almost the same kind as of it's
@@ -199,14 +166,16 @@ define [
     sent_scope    = @inflector.singularize scope.resource.toString()
     current_scope = @inflector.singularize @scope.resource.toString()
 
-    deferred      = @sandbox.data.deferred()
-
     if sent_scope != current_scope
       throw new TypeError "Invalid scope sent to viewer@#{@identifier} sent: '#{sent_scope}', expected: '#{current_scope}'"
 
     # For sobsequent usages we must store the scope
     @scope = scope
 
+    # TODO better hierachical event distribution
+    for { _widget: widget } in @sandbox._children?
+      widget.scope_to? child_scope
+
     @sandbox.emit "viewer.#{@identifier}.scope_changed", @scope
 
     # TODO better scope data binding, and updating
@@ -216,15 +185,6 @@ define [
 
     @repopulate()
 
-  # TODO rename this method
-  # TODO also move this to an external tag
-  statused: (status) ->
-    if status
-      @status = status
-      @sandbox.emit "viewer.#{@identifier}.status_changed", status
-    else
-      @status
-
   repopulate: ->
     unless @fetching?
       if @load?
@@ -235,10 +195,9 @@ define [
 
     # TODO store spinner instance, instead of creating a new one every time
     unless @load?
-      @load   = @sandbox.ui.loader @$results
+      @load   = @sandbox.ui.loader @$el.find '.results .items'
 
       # TODO implement status for viewer widget
-      @statused 'loading'
       @$el.addClass 'idle'
       @$el.removeClass 'loading'
 
@@ -253,7 +212,7 @@ define [
       records = _.map records, @resource, @resource unless records[0]?.resource or records[0]?.itemable
 
       # TODO implement Array.concat ou Array.merge in observer, and
-      # use it here instead of overriding all records
+      # use it here instead of pushing each record
       viewer.items = records
 
       # Start widgets created by bindings
@@ -272,20 +231,21 @@ define [
       @sandbox.emit "viewer.#{@identifier}.populated", records, @
 
     @fetching.always =>
+      # TODO implement status for viewer widget
+      @$el.addClass 'idle'
+      @$el.removeClass 'loading'
+
       if @load?
         @load.stop()
         @load = null
 
-      # TODO implement status for viewer widget
-      @$el.removeClass 'loading'
-      @statused 'idle'
-      @$el.addClass 'idle'
 
-  populate: ->
-    @load   = @sandbox.ui.loader @$el
+  populate: (handlers) ->
+    sandbox = @sandbox
+
+    @load   = @sandbox.ui.loader @$results
 
     # TODO implement status for viewer widget
-    @statused 'loading'
     @$el.removeClass 'idle'
     @$el.addClass 'loading'
 
@@ -310,12 +270,9 @@ define [
 
       @load.stop()
 
-      # TODO do not send records as parameter
-      @presentation = @presenter records, @scope, @handleable
+      @presentation = @presenter records, @scope
 
-      # Initialize elements
       @$el.html templates[@options.resource]
-      @$results = @$el.find '.results .items'
 
       if records.length
         # boo.initialize @$el.find '.results .items'
@@ -342,7 +299,7 @@ define [
 
 
   plugins: (options) ->
-    deferreds = [@]
+    deferreds = []
 
     deferreds.push paginable  widget: @ if options.page
     deferreds.push scrollable widget: @ if options.scroll
@@ -353,7 +310,6 @@ define [
   # TODO move this method to an extension
   syncronize_children: ->
     @sandbox._children ||= []
-    @sandbox._widget   ||= @
 
     # Add possible new childs
     @constructor.startAll(@$el).done (widgets...) =>
@@ -363,12 +319,6 @@ define [
 
       @sandbox._children = @sandbox._children.concat widgets
 
-      for widget in widgets
-        # TODO emit this event only when all siblings have initialized
-        @sandbox.emit "#{widget.name}.#{widget.identifier}.siblings_initialized", @sandbox._children
-
-      true
-
     # TODO better internal aura widget selection
     # Prevent other child to be instantiated
     @$el.find('[data-aura-widget]').each (i, element) ->
@@ -452,56 +402,43 @@ define [
   initialize: (options) ->
     # TODO import core extensions in another place
     @resource      = @sandbox.resource options.resource
-    @scope         = @resource
-
-    # Instantiate it's on handleable factory
-    widget         = @
-    widgetable     = stampit().enclose -> @widget = widget; @
-    @handleable    = stampit.compose widgetable, handleable
+    @scope         = model = @resource
 
     {sandbox: {util: {@inflector}}}   = @
 
     @sandbox.on "viewer.#{@identifier}.scope", @scope_to, @
 
-    # Initalize plugins
-    # TODO think how to implement plugins api
+    # Iniitalize plugins
     loading = @plugins options
 
-    @statused 'idle'
     @$el.addClass "viewer widget #{@inflector.cssify @identifier} idle clearfix"
 
-    loading.done (widget) ->
-      widget.require_custom options.resource
-
-  # TODO externalize this code to an extension
-  require_custom: (resource) ->
-    deferred = @sandbox.data.deferred()
+    loading.done => @require_custom options
 
+  require_custom: (options) ->
     # Fetch custom templates
     # TODO better custom templates structure and custom presenter
     # TODO better segregation of concerns on this code
     # TODO handle case where custom presenter does not exist!
     require [
-      "text!./widgets/viewer/templates/default/#{resource}.html"
-      "./widgets/viewer/presenters/#{resource}"
+      "text!./widgets/viewer/templates/default/#{options.resource}.html"
+      "./widgets/viewer/presenters/#{options.resource}"
       ], (custom_default_template, custom_presenter) =>
 
-      unless presenter.hasOwnProperty 'handlers'
-        Object.defineProperty presenter, 'handlers',
-          get: -> throw new Error "presenter.hanlder is deprecated, please compose upon handleable"
-          set: -> throw new Error "presenter.hanlder is deprecated, please compose upon handleable"
+      # TODO Better way to preserve widgets handlers
+      handlers     =
+        item:
+          clicked: (event, models) =>
+            @select models.item
 
-      custom_default_template and templates[resource] = custom_default_template
-      @presenter  = @sandbox.util.extend custom_presenter, presenter if custom_presenter
+      presenter.handlers = handlers
 
-      # Fetch default data
-      @populate()
+      custom_default_template and templates[options.resource] = custom_default_template
+      @presenter = @sandbox.util.extend custom_presenter, presenter if custom_presenter
 
-      deferred.resolveWith @, [resource]
+      @$results = @$el.find '.results .items'
 
-    , (error) =>
-      # TODO handle other status codes with xhr error
-      @sandbox.logger.error "Error when loading presenter and template for resource '#{resource}':\n\n", error.message + "\n\n", error
-      deferred.rejectWith @, arguments
+      # Fetch default data
+      @populate handlers
 
-    deferred
+    true

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

@@ -1,6 +1,11 @@
 'use strict';
 
-define ['stampit/stampit', 'observable'], (stampit, observable) ->
+window.domo = []
+
+# TODO define componentjs required packages, as requirejs packages
+observable   = require('indefinido-observable').mixin
+
+define ['stampit/stampit'], (stampit) ->
 
   scopingable = stampit
     start: ->
@@ -37,6 +42,7 @@ define ['stampit/stampit', 'observable'], (stampit, observable) ->
     @
 
 
+
   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.20"
+  VERSION = "0.4.21"
 end