ultimate-base 0.2.1 → 0.2.2

data/app/assets/javascripts/{backbone/ultimate → ultimate/backbone}/app.js.coffee

@@ -1,6 +1,6 @@
-Backbone.Ultimate ||= {}
+(@Ultimate ||= {}).Backbone ||= {}
 
-class Backbone.Ultimate.App
+class Ultimate.Backbone.App
   @App: null
 
   name: null
@@ -14,7 +14,7 @@ class Backbone.Ultimate.App
 
   constructor: (name = null) ->
     if @constructor.App
-      throw new Error("Can't create new Backbone.Ultimate.App because the single instance has already been created");
+      throw new Error("Can't create new Ultimate.Backbone.App because the single instance has already been created");
     else
       @constructor.App = @
       @name = name
@@ -22,4 +22,4 @@ class Backbone.Ultimate.App
 
 
 
-_.extend Backbone.Ultimate.App::, Backbone.Events
+_.extend Ultimate.Backbone.App::, Backbone.Events

data/app/assets/javascripts/{backbone/ultimate → ultimate/backbone}/collection.js.coffee

@@ -1,6 +1,6 @@
-Backbone.Ultimate ||= {}
+(@Ultimate ||= {}).Backbone ||= {}
 
-class Backbone.Ultimate.Collection extends Backbone.Collection
+class Ultimate.Backbone.Collection extends Backbone.Collection
 
   ready: (callback, context = @) ->
     unless @length

data/app/assets/javascripts/{backbone → ultimate/backbone/lib}/backbone.js

@@ -134,6 +134,9 @@
 
       rest = [];
       events = events.split(eventSplitter);
+
+      // Fill up `rest` with the callback arguments.  Since we're only copying
+      // the tail of `arguments`, a loop is much faster than Array#slice.
       for (i = 1, length = arguments.length; i < length; i++) {
         rest[i - 1] = arguments[i];
       }
@@ -1023,6 +1026,9 @@
       var docMode           = document.documentMode;
       var oldIE             = (isExplorer.exec(navigator.userAgent.toLowerCase()) && (!docMode || docMode <= 7));
 
+      // Normalize root to always include trailing slash
+      if (!trailingSlash.test(this.options.root)) this.options.root += '/';
+
       if (oldIE && this._wantsHashChange) {
         this.iframe = Backbone.$('<iframe src="javascript:0" tabindex="-1" />').hide().appendTo('body')[0].contentWindow;
         this.navigate(fragment);
@@ -1042,7 +1048,7 @@
       // opened by a non-pushState browser.
       this.fragment = fragment;
       var loc = this.location;
-      var atRoot  = (loc.pathname === this.options.root) && !loc.search;
+      var atRoot = (loc.pathname.replace(/[^/]$/, '$&/') === this.options.root) && !loc.search;
 
       // If we've started off with a route from a `pushState`-enabled browser,
       // but we're currently in a browser that doesn't support it...
@@ -1284,8 +1290,8 @@
     _ensureElement: function() {
       if (!this.el) {
         var attrs = _.extend({}, getValue(this, 'attributes'));
-        if (this.id) attrs.id = this.id;
-        if (this.className) attrs['class'] = this.className;
+        if (this.id) attrs.id = getValue(this, 'id');
+        if (this.className) attrs['class'] = getValue(this, 'className');
         this.setElement(this.make(getValue(this, 'tagName'), attrs), false);
       } else {
         this.setElement(this.el, false);

data/app/assets/javascripts/{backbone/ultimate → ultimate/backbone}/model.js.coffee

@@ -1,6 +1,6 @@
-Backbone.Ultimate ||= {}
+(@Ultimate ||= {}).Backbone ||= {}
 
-class Backbone.Ultimate.Model extends Backbone.Model
+class Ultimate.Backbone.Model extends Backbone.Model
 
   ready: (callback, context = @) ->
     if _.isEmpty(@attributes)

data/app/assets/javascripts/{backbone/ultimate → ultimate/backbone}/router.js.coffee

@@ -1,6 +1,6 @@
-Backbone.Ultimate ||= {}
+(@Ultimate ||= {}).Backbone ||= {}
 
-class Backbone.Ultimate.Router extends Backbone.Router
+class Ultimate.Backbone.Router extends Backbone.Router
 
   namedParam    = /:\w+/g
   splatParam    = /\*\w+/g

data/app/assets/javascripts/{backbone/ultimate → ultimate/backbone}/view.js.coffee

@@ -1,6 +1,6 @@
-Backbone.Ultimate ||= {}
+(@Ultimate ||= {}).Backbone ||= {}
 
-class Backbone.Ultimate.View extends Backbone.View
+class Ultimate.Backbone.View extends Backbone.View
 
   viewOptions: []
 

data/app/assets/javascripts/ultimate/backbone/views/slider.js.coffee

@@ -0,0 +1,128 @@
+Ultimate.Backbone.Views ||= {}
+
+class Ultimate.Backbone.Views.Slider extends Ultimate.Backbone.View
+  el: ".g-slider"
+
+  nodes: ->
+    jNavs: ".nav"
+    jDisplay:
+      selector: ".slide-display"
+      jLine:
+        selector: ".slide-line"
+        jItems: ".item"
+
+  events: ->
+    "click   .nav.enabled" : "navClick"
+
+  viewOptions: ["vertical", "cycling", "interval", "durationPerPixel", "prevItems"]
+
+  vertical: false
+  cycling: false
+  interval: 0
+  durationPerPixel: 2
+
+  totalItems: 0
+  itemSize: 0
+  displayItems: 0
+  moveItems: 0
+  overItems: 0
+  prevItems: 0 # can as setting
+
+  timeoutId: null # for cycling == true
+  startSide: "left" # set by @vertical
+  sizeAttr: "width" # set by @vertical
+
+  initialize: (options) ->
+    @startSide = if @vertical then "top" else "left"
+    @sizeAttr = if @vertical then "height" else "width"
+    @totalItems = @jItems.length
+    if @totalItems
+      @jItems.each (index) -> $(@).attr "data-slide-index", index
+      jFirstItem = @jItems.first()
+      @itemSize = jFirstItem[_.camelize("outer-#{@sizeAttr}")](true)
+      needSize = @totalItems * @itemSize
+      @jLine[@sizeAttr](needSize)  if @jLine[@sizeAttr]() < needSize
+      @displayItems = Math.round(@jDisplay[@sizeAttr]() / @itemSize)
+      @moveItems = Math.round(@displayItems / 2)
+      @overItems = @totalItems - @displayItems
+      if @overItems
+        if @prevItems
+          @jLine.css @startSide, (- @prevItems * @itemSize)
+        else
+          @prevItems = Math.round(- @jLine.position()[@startSide] / @itemSize)
+        @refreshNavs()
+        @setTimeout()  if @interval
+      else
+        @prevItems = 0
+      #@bus().trigger "slider:slide", 0, @prevItems, jItems.eq(@prevItems)
+
+  currentIndex: ->
+    @jLine.find(".item:eq(#{@prevItems})").data("slideIndex")
+
+  trySlide: (move = 1, moveItems = move * @moveItems) ->
+    if @totalItems and @overItems
+      newPrevItems = @prevItems + moveItems
+      needFlip = false
+      flipItems = 0
+      animatedOverItems = 0
+      if newPrevItems < 0
+        if @cycling
+          needFlip = true
+          flipItems = newPrevItems
+          animatedOverItems = Math.ceil(- @jLine.position()[@startSide] / @itemSize)
+        newPrevItems = 0
+      else if newPrevItems > @overItems
+        if @cycling
+          needFlip = true
+          flipItems = newPrevItems - @overItems
+          animatedOverItems = @overItems - Math.floor(- @jLine.position()[@startSide] / @itemSize)
+        newPrevItems = @overItems
+      if needFlip
+        if flipItems and animatedOverItems < @overItems
+          @prevItems -= flipItems
+          if flipItems < 0
+            @jLine.prepend @jLine.find(".item").slice(flipItems)
+          else
+            @jLine.append @jLine.find(".item").slice(0, flipItems)
+          props = {}
+          props[@startSide] = "+=#{flipItems * @itemSize}"
+          @jLine.css props
+          @slideTo newPrevItems
+      else
+        @slideTo newPrevItems
+
+  trySlideToStart: ->
+    if @totalItems and @overItems
+      @slideTo 0
+
+  _duration: (deltaItems) ->
+    Math.sqrt(Math.abs(deltaItems) * @itemSize * 500) * @durationPerPixel
+
+  # TODO protect bounds, mb trySlideTo() and _slideTo()
+  slideTo: (newPrevItems) ->
+    deltaItems = newPrevItems - @prevItems
+    if deltaItems
+      #@bus().trigger "slider:slide", deltaItems, newPrevItems, jLine.find(".item:eq(#{newPrevItems})")
+      props = {}
+      props[@startSide] = (- newPrevItems * @itemSize)
+      @jLine.stop(true).animate props, @_duration(deltaItems)
+      @prevItems = newPrevItems
+      @refreshNavs()
+      @setTimeout()  if @interval
+    deltaItems
+
+  refreshNavs: ->
+    @jNavs.filter(".prev").toggleClass "enabled", @cycling or @prevItems > 0
+    @jNavs.filter(".next").toggleClass "enabled", @cycling or (@overItems - @prevItems) > 0
+
+  setTimeout: ->
+    if @timeoutId?
+      clearTimeout @timeoutId
+      @timeoutId = null
+    @timeoutId = setTimeout =>
+        @trySlide()
+      , @interval
+
+  navClick: (event) ->
+    @trySlide if $(event.currentTarget).hasClass("prev") then -1 else 1
+    false

data/app/assets/javascripts/ultimate/improves/typed-field.js.coffee

@@ -70,7 +70,11 @@
         .change()
     @
 
+  #class Backbone.Ultimate.
+
   $.fn.observeTypedFields = (selector = 'input:text[data-data-type], input:text[data-regexp-mask]') ->
+
+
     return @  unless @length
 
     @on 'keypress', selector, (event) ->

data/lib/ultimate-base/version.rb

@@ -1,5 +1,5 @@
 module Ultimate
   module Base
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ultimate-base
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2012-08-14 00:00:00.000000000 Z
 dependencies: []
 description: Ultimate UI core, base helpers and improves for Ruby on Rails Front-end
 email:
@@ -26,12 +26,13 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/assets/javascripts/backbone/backbone.js
-- app/assets/javascripts/backbone/ultimate/app.js.coffee
-- app/assets/javascripts/backbone/ultimate/collection.js.coffee
-- app/assets/javascripts/backbone/ultimate/model.js.coffee
-- app/assets/javascripts/backbone/ultimate/router.js.coffee
-- app/assets/javascripts/backbone/ultimate/view.js.coffee
+- app/assets/javascripts/ultimate/backbone/app.js.coffee
+- app/assets/javascripts/ultimate/backbone/collection.js.coffee
+- app/assets/javascripts/ultimate/backbone/lib/backbone.js
+- app/assets/javascripts/ultimate/backbone/model.js.coffee
+- app/assets/javascripts/ultimate/backbone/router.js.coffee
+- app/assets/javascripts/ultimate/backbone/view.js.coffee
+- app/assets/javascripts/ultimate/backbone/views/slider.js.coffee
 - app/assets/javascripts/ultimate/base.js.coffee
 - app/assets/javascripts/ultimate/bus.js.coffee
 - app/assets/javascripts/ultimate/devise.js.coffee