ende 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: caaa7f535f49335e7750267ca46931905ff7b23e
-  data.tar.gz: 25f153014541704bf57f2ba14164dac5e1f748cf
+  metadata.gz: 728dddca0551ce2521fdc12aed9b1c13e74ed4ca
+  data.tar.gz: 950f7a7b513e054456e9fdd33acc4b8c6ae8619c
 SHA512:
-  metadata.gz: b6cabe61279b7634405d4f46f6f3b9d60afb2495d150a1dc0647a8bc54f4484c8e304841cb8a054da20534aff1a0f4b8a35ae87a8fc7d51b384d057ebf5439e0
-  data.tar.gz: 15724ab7f7bb9a085dda78e3274a7c290752d440727168c2b7b2f985211e04b60567b72d854e12a4e667007f57960707c7b1973ff3e0cc23c93a71f83df8f77e
+  metadata.gz: 08b028d1bb21acef7143fff8359aff74b12edc3cc7f27eb485faeb4a72feb7d77e4bde5e7a5baa9a7a56cfee038ec70a1d9e0984370073f162f1c08dd9c237c7
+  data.tar.gz: bc6e065ba70c206b4e95ada1c5397dcaca2b7c68bdaae99ec0cb3202b5451ad9d8d1c414e981b1c96a2bd05dc1d0d83ae0a6021a70a68ab6cc5a5a8574dbe611

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

@@ -52,7 +52,7 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview.js'], (
     viewed: (event, in_view, horizontal, vertical) ->
       boo[if in_view then 'pride' else 'shame'] event.target
 
-  version: '0.1.0'
+  version: '0.1.1'
 
   # TODO better separation of concerns
   # TODO Current remote page that is beign displayed
@@ -84,6 +84,46 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview.js'], (
     for { _widget: widget } in @sandbox._children
       widget.scope_to? child_scope
 
+    @repopulate()
+    @sandbox.emit "viewer.#{@identifier}.scope_changed", @scope
+
+  repopulate: ->
+    if @load?
+      @load.stop()
+      @load = null
+
+    # TODO store spinner instance, instead of creating a new one every time
+    @load = @sandbox.ui.loader @$el.find '.results .items' unless @load?
+
+    viewer        = @presentation.viewer
+    viewer.items  = []
+    presented_ids = []
+
+    # TODO generalise this filtering option
+    presented = #for item in selected
+      # if @scope?.scope.data.by_type_id
+      #   querier = item.models.by_type_id.apply item.models, @scope.scope.data.by_type_id
+      # else
+      #   querier = item.models
+
+      # TODO make scope.all method use scope too!
+      @scope.fetch null, (records) ->
+        _.map records, @       # TODO make scope.all method use scope too!
+
+        for record in records
+          viewer.items.push record if presented_ids.indexOf(record._id) == -1
+
+          presented_ids = _.union presented_ids, _.pluck(records, '_id')
+
+    $.when(presented...).then =>
+      boo.initialize @$el.find '.results .items'
+      presented_ids = []
+
+      if @load?
+        @load.stop()
+        @load = null
+
+
   populate: (handlers) ->
     # Initialize dependencies
     @scope.all (records) =>
@@ -109,13 +149,6 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview.js'], (
                  unfolding:
                    back : 'hide'
 
-               drawing.style (i, node) ->
-                 value = node.getAttribute 'style'
-                 value = value.replace /fill:(.*?);/, 'fill: black;'
-                 value = value.replace /stroke:(.*?);/, 'stroke: white;'
-                 node.setAttribute 'style', value
-             , 100
-
       @handles 'click', 'back', '.back'
 
   initialize: (options) ->
@@ -125,7 +158,6 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview.js'], (
     # TODO import core extensions in another place
     @scope = model = @sandbox.models[options.resource]
     cssify         = @sandbox.util.inflector.cssify
-    loader         = @sandbox.ui.loader
     @sandbox.on "viewer.#{@identifier}.scope", @scope_to, @
 
     # Extend presentation
@@ -149,37 +181,6 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview.js'], (
           clicked: (event, models) =>
             @select models.item
 
-        list:
-          changed: (change, selection) =>
-            # TODO store spinner instance, instead of creating a new one every time
-            @load = loader @$el.find '.results .items' unless @load?
-
-          stabilized: (selected) =>
-            if @load
-              @load.stop()
-              @load = null
-
-            viewer        = @presentation.viewer
-            viewer.items  = []
-            presented_ids = []
-
-            # TODO generalise this filtering option
-            presented = for item in selected
-              if @scope?.scope.data.by_type_id
-                querier = item.models.by_type_id.apply item.models, @scope.scope.data.by_type_id
-              else
-                querier = item.models
-
-              querier.all (records) =>
-                for record in records
-                  viewer.items.push record if presented_ids.indexOf(record._id) == -1
-
-                presented_ids = _.union presented_ids, _.pluck(records, '_id')
-
-            $.when(presented...).then =>
-              boo.initialize @$el.find '.results .items'
-              presented_ids = []
-
       presenter.handlers = handlers
 
       custom_default_template and templates[options.model] = custom_default_template
@@ -190,7 +191,7 @@ define ['./states/index', './presenters/default', '/assets/jquery/inview.js'], (
       @$results = @$el.find '.results .items'
 
       # Fetch default data
-      @load = loader @results
+      @load = @sandbox.ui.loader @results
       # TODO better scoping support by viewer
 
       @populate handlers

data/lib/ende/version.rb

@@ -1,3 +1,3 @@
 module Ende
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ende
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Heitor Salazar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-26 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler