chr 0.2.8 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fceeef7d448d2cdc5eb8b0d8b83b41f9e3286eb
-  data.tar.gz: e7ca6fddaae45df4c2d0e53ee1bd288975d8aa6c
+  metadata.gz: 7f826f08992b4b9540353bcbbba91f9065e0de72
+  data.tar.gz: a63be1339e56a9672be6dd74e1e4a8c527827bde
 SHA512:
-  metadata.gz: 6c18ab1dafebd9e6321c6d44734b11af06d2b2e42a46a0191c5b6c64b1043633e7621d8224dd75d6c6b543cb181ea456183c7940386a47baff602c93ab626e86
-  data.tar.gz: d568e55272035adadfa181cc463ba89399822a07b8969c1af63e482106a93b096993dd247cf7c59ca8ab5662e61b11ae3c732efa33c6958d6f62eee35d57167d
+  metadata.gz: b3213804478267d46391d85bacfa7adb5070a67667b0c1310004480f44a9793903f9634f0b61c8ac7e603fc400b32359d7aa4ee269ac72a1ccd026501b7b3344
+  data.tar.gz: 5308776a2b5f5b5b76385a14ca232786b8555cff71419ee3f7d267b35089bc857591f04647c061aee2e4d362f82bac665ece115f4726bb9fd90dcfefa180448c

data/Gruntfile.coffee

@@ -10,6 +10,7 @@ module.exports = (grunt) ->
           'build/chr.js': [
             # core
             'app/assets/javascripts/chr/core/utils.coffee'
+            'app/assets/javascripts/chr/core/chr_router.coffee'
             'app/assets/javascripts/chr/core/chr.coffee'
             'app/assets/javascripts/chr/core/module.coffee'
             'app/assets/javascripts/chr/core/list_config.coffee'
@@ -18,29 +19,34 @@ module.exports = (grunt) ->
             'app/assets/javascripts/chr/core/list_search.coffee'
             'app/assets/javascripts/chr/core/list.coffee'
             'app/assets/javascripts/chr/core/item.coffee'
+            'app/assets/javascripts/chr/core/view_local-storage.coffee'
             'app/assets/javascripts/chr/core/view.coffee'
-            # form
-            'app/assets/javascripts/chr/form/form.coffee'
-            'app/assets/javascripts/chr/form/input-form_reorder.coffee'
-            'app/assets/javascripts/chr/form/input-form.coffee'
-            'app/assets/javascripts/chr/form/input-string.coffee'
-            'app/assets/javascripts/chr/form/input-hidden.coffee'
-            'app/assets/javascripts/chr/form/input-checkbox.coffee'
-            'app/assets/javascripts/chr/form/input-color.coffee'
-            'app/assets/javascripts/chr/form/input-date.coffee'
-            'app/assets/javascripts/chr/form/input-file.coffee'
-            'app/assets/javascripts/chr/form/input-list_reorder.coffee'
-            'app/assets/javascripts/chr/form/input-list.coffee'
-            'app/assets/javascripts/chr/form/input-password.coffee'
-            'app/assets/javascripts/chr/form/input-select.coffee'
-            'app/assets/javascripts/chr/form/input-text.coffee'
             # stores
-            'app/assets/javascripts/chr/store/_array-store.coffee'
-            'app/assets/javascripts/chr/store/_object-store.coffee'
+            'app/assets/javascripts/chr/store/array-store.coffee'
+            'app/assets/javascripts/chr/store/object-store.coffee'
             'app/assets/javascripts/chr/store/rest-array-store.coffee'
             'app/assets/javascripts/chr/store/rest-object-store.coffee'
-            'app/assets/javascripts/chr/store/mongosteen-array-store.coffee'
-            'app/assets/javascripts/chr/store/mongosteen-object-store.coffee'
+            'app/assets/javascripts/chr/store/rails-form-object-parser.coffee'
+            'app/assets/javascripts/chr/store/rails-array-store.coffee'
+            'app/assets/javascripts/chr/store/rails-object-store.coffee'
+            # form
+            'app/assets/javascripts/form/form.coffee'
+            'app/assets/javascripts/form/input-form_reorder.coffee'
+            'app/assets/javascripts/form/input-form.coffee'
+            'app/assets/javascripts/form/input-string.coffee'
+            'app/assets/javascripts/form/input-hidden.coffee'
+            'app/assets/javascripts/form/input-checkbox.coffee'
+            'app/assets/javascripts/form/input-color.coffee'
+            'app/assets/javascripts/form/input-date.coffee'
+            'app/assets/javascripts/form/input-file.coffee'
+            'app/assets/javascripts/form/input-list_typeahead.coffee'
+            'app/assets/javascripts/form/input-list_reorder.coffee'
+            'app/assets/javascripts/form/input-list.coffee'
+            'app/assets/javascripts/form/input-password.coffee'
+            'app/assets/javascripts/form/input-select.coffee'
+            'app/assets/javascripts/form/input-text.coffee'
+            'app/assets/javascripts/form/input-select2.coffee'
+            'app/assets/javascripts/form/extendable-group.coffee'
           ]
 
           'build/input-ace.js': [
@@ -55,20 +61,20 @@ module.exports = (grunt) ->
     concat:
       chr:
         src: [
-          'app/assets/javascripts/chr/vendor/slip.js'
-          'app/assets/javascripts/chr/vendor/jquery.scrollparent.js'
-          'app/assets/javascripts/chr/vendor/jquery.textarea_autosize.js'
-          'app/assets/javascripts/chr/vendor/jquery.typeahead.js'
+          'app/assets/javascripts/vendor/slip.js'
+          'app/assets/javascripts/vendor/jquery.scrollparent.js'
+          'app/assets/javascripts/vendor/jquery.textarea_autosize.js'
+          'app/assets/javascripts/vendor/jquery.typeahead.js'
           'build/chr.js'
         ]
         dest: 'dist/chr.js'
 
       ace:
         src: [
-          'app/assets/javascripts/chr/vendor/ace.js'
-          'app/assets/javascripts/chr/vendor/mode-html.js'
-          'app/assets/javascripts/chr/vendor/mode-markdown.js'
-          'app/assets/javascripts/chr/vendor/marked.js'
+          'app/assets/javascripts/vendor/ace.js'
+          'app/assets/javascripts/vendor/mode-html.js'
+          'app/assets/javascripts/vendor/mode-markdown.js'
+          'app/assets/javascripts/vendor/marked.js'
           'build/input-ace.js'
         ]
         dest: 'dist/input-ace.js'

data/README.md

@@ -39,12 +39,17 @@ Styles setup:
 
 ## Documentation
 
-* [Start with Rails](docs/rails.md)
+* [Rails Setup](docs/rails.md)
 * [Bootstrap Data](docs/bootstrap.md)
 
 More documentation and samples comming soon...
 
 
+## Notes
+
+1. Consider replace ```slip.js``` with [sortable.js](https://github.com/RubaXa/Sortable)
+
+
 ## Character family:
 
 - [Character](https://github.com/slate-studio/chr): Powerful responsive javascript CMS for apps

data/app/assets/javascripts/chr.coffee

@@ -6,21 +6,23 @@
 #= require ./chr/core/item
 #= require ./chr/core/view
 
-#= require ./chr/form/form
-#= require ./chr/form/input-form
-#= require ./chr/form/input-hidden
-#= require ./chr/form/input-string
-#= require ./chr/form/input-text
-#= require ./chr/form/input-checkbox
-#= require ./chr/form/input-password
-#= require ./chr/form/input-color
-#= require ./chr/form/input-file
-#= require ./chr/form/input-list
-#= require ./chr/form/input-select
-
-#= require ./chr/store/_object-store
-#= require ./chr/store/_array-store
+#= require ./chr/store/object-store
+#= require ./chr/store/array-store
 #= require ./chr/store/rest-object-store
 #= require ./chr/store/rest-array-store
-#= require ./chr/store/mongosteen-object-store
-#= require ./chr/store/mongosteen-array-store
+#= require ./chr/store/rails-object-store
+#= require ./chr/store/rails-array-store
+
+#= require ./form/form
+#= require ./form/input-form
+#= require ./form/input-hidden
+#= require ./form/input-string
+#= require ./form/input-text
+#= require ./form/input-checkbox
+#= require ./form/input-password
+#= require ./form/input-color
+#= require ./form/input-file
+#= require ./form/input-list
+#= require ./form/input-select
+#= require ./form/input-select2
+#= require ./form/expandable-group

data/app/assets/javascripts/chr/core/chr.coffee

@@ -9,19 +9,21 @@
 # -----------------------------------------------------------------------------
 # CHARACTER
 # -----------------------------------------------------------------------------
+#
 # Public attributes:
 #   modules
 #   formInputs
 #   itemsPerPageRequest
 #
 # Public methods:
-#   start(@config)                 - start the character app with configuration
-#   addMenuItem(moduleName, title) - add item to main menu
-#   showAlert(message)             - show alert notification
-#   showError(message)             - show error message
-#   isMobile()                     - check if running on mobile
-#   unsetActiveListItems()         - clear selection from all list items
-#   updateHash(hash, skipHashChange=false)
+#   start(@config)              - start the character app with configuration
+#   updateHash(hash, skipRoute) - change window location hash
+#   isMobile()                  - check if running on mobile
+#   showAlert(message)          - show alert notification
+#   showError(message)          - show error message
+#
+# Dependencies:
+#= require ./chr_router
 #
 # -----------------------------------------------------------------------------
 class @Chr
@@ -34,8 +36,9 @@ class @Chr
 
   # PRIVATE ===============================================
 
-  _unset_active_menu_items: ->
+  _unset_active_items: ->
     $('.sidebar .menu a.active').removeClass('active')
+    $('.list .items .item.active').removeClass('active')
 
 
   _set_active_menu_item: ->
@@ -46,54 +49,41 @@ class @Chr
         return $(a).addClass('active')
 
 
-  _navigate: (path) -> #/<module>[/<list>][/new]OR[/view/<objectId>]
-    crumbs = path.split('/')
+  _add_menu_item: (moduleName, title) ->
+    @$mainMenu.append "<a href='#/#{ moduleName }' class='menu-#{ moduleName }'>#{ title }</a>"
 
-    # if module changed, hide previous module
-    if @module != @modules[crumbs[1]]
-      @module?.hide()
 
-    @module = @modules[crumbs[1]] # module name on position 1
+  _bind_hashchange: ->
+    @skipRoute = false
 
-    if @module
-      @module.show()
+    window.onhashchange = =>
+      @_unset_active_items()
 
-      config = @module.config
-      crumbs = crumbs.splice(2) # remove #/<module> part
+      if ! @skipRoute then @_route()
+      @skipRoute = false
 
-      if crumbs.length > 0
-        for crumb in crumbs
-          if crumb == 'new'
-            return @module.showView(null, config, 'New')
+      $(this).trigger 'hashchange'
 
-          if crumb == 'view'
-            objectId = _last(crumbs)
-            return @module.showViewByObjectId(objectId, config)
+    $(this).on 'hashchange', => @_set_active_menu_item()
 
-          config = config.items[crumb]
 
-          if config.objectStore
-            return @module.showViewByObjectId('', config, crumb.titleize())
+  _on_start: ->
+    if location.hash != ''
+      @_route()
+      return $(this).trigger('hashchange')
 
-          else
-            @module.showNestedList(crumb)
-      else
-        @module.showRootList()
+    if ! @isMobile()
+      return @updateHash('#/' + Object.keys(@modules)[0])
 
 
   # PUBLIC ================================================
 
-  unsetActiveListItems: ->
-    $('.list .items .item.active').removeClass('active')
-
-
   isMobile: ->
     $(window).width() < 760
 
 
-  updateHash: (hash, skipHashChange=false) ->
-    window._skipHashchange = skipHashChange
-    location.hash = hash
+  updateHash: (path, @skipRoute=false) ->
+    window.location.hash = path
 
 
   start: (@config) ->
@@ -101,43 +91,15 @@ class @Chr
     @$navBar   =$ "<nav class='sidebar'>"
     @$mainMenu =$ "<div class='menu'>"
 
-    @$navBar.append @$mainMenu
-    @$el.append @$navBar
-
-    @modules[name] = new Module(this, name, config) for name, config of @config.modules
-
-    $(this).on 'hashchange', => @_set_active_menu_item()
-
-    window.onhashchange = =>
-      @_unset_active_menu_items()
-      @unsetActiveListItems()
-
-      # this allows to skip chr _navigate method for silent hashchanges,
-      # e.g. close view event
-      if not window._skipHashchange then @_navigate(location.hash)
-      window._skipHashchange = false
+    @$navBar.append(@$mainMenu)
+    @$el.append(@$navBar)
 
-      # triggers hashchange event which is used for navigation
-      # related code, e.g. list active item selection
-      $(this).trigger 'hashchange'
+    for name, config of @config.modules
+      @modules[name] = new Module(this, name, config)
+      @_add_menu_item(name, @modules[name].menuTitle)
 
-    # use class 'silent' for <a> when need to skip onhashchange event
-    $(document).on 'click', 'a.silent', (e) -> window._skipHashchange = true
-
-    # if not mobile navigate on first page load or page refresh
-    window._skipHashchange = false
-
-    # if hash is not empty go to module
-    if location.hash != ''
-      @_navigate(location.hash)
-      $(this).trigger('hashchange')
-    else if ! @isMobile()
-      # if on desktop/tablet while hash is empty go to first module in the list
-      location.hash = '#/' + Object.keys(@modules)[0]
-
-
-  addMenuItem: (moduleName, title) ->
-    @$mainMenu.append "<a href='#/#{ moduleName }'>#{ title }</a>"
+    @_bind_hashchange()
+    @_on_start()
 
 
   showAlert: (message) ->
@@ -148,9 +110,12 @@ class @Chr
     alert 'Error: ' + message
 
 
-# -----------------------------------------------------------------------------
+include(Chr, chrRouter)
+
+
+# ---------------------------------------------------------
 # Initialize `chr` object in global scope
-# -----------------------------------------------------------------------------
+# ---------------------------------------------------------
 window.chr = new Chr()
 
 

data/app/assets/javascripts/chr/core/chr_router.coffee

@@ -0,0 +1,141 @@
+# -----------------------------------------------------------------------------
+# Author: Alexander Kravets <alex@slatestudio.com>,
+#         Slate Studio (http://www.slatestudio.com)
+#
+# Coding Guide:
+#   https://github.com/thoughtbot/guides/tree/master/style/coffeescript
+# -----------------------------------------------------------------------------
+
+# -----------------------------------------------------------------------------
+# CHARACTER ROUTER
+# -----------------------------------------------------------------------------
+
+@chrRouter =
+
+  # PRIVATE ===============================================
+
+  # format: #/<module>[/<list>]+[/new]OR[/view/<objectId>]
+  _parse_path: ->
+    params =
+      path:               location.hash
+      module:             null
+      backToMenu:         false
+      moduleHasChanged:   false
+      nestedListNames:    []
+      lastNestedListName: null
+      showView:           false
+      objectId:           null
+      showNestedView:     false
+
+    crumbs                  = params.path.split('/')
+    module                  = @modules[crumbs[1]]
+    params.module           = module
+    params.backToMenu       = if module then false else true
+    params.moduleHasChanged = ( @module != module )
+
+    crumbs = crumbs.splice(2)
+    for crumb in crumbs
+      if crumb == 'new'
+        return $.extend(params, { showView: true })
+
+      if crumb == 'view'
+        return $.extend(params, { showView: true, objectId: _last(crumbs) })
+
+      params.lastNestedListName = crumb
+      params.nestedListNames.push(crumb)
+
+    # check if last list name is a name for nested view
+    if params.lastNestedListName
+      lastList = module.nestedLists[params.lastNestedListName]
+      if ! lastList
+        nestedViewName            = params.nestedListNames.pop()
+        params.lastNestedListName = _last(params.nestedListNames)
+
+        parentList  = module.nestedLists[params.lastNestedListName]
+        parentList ?= module.rootList
+
+        params.showNestedView = true
+        params.showView       = true
+        params.objectId       = ''
+        params.config         = parentList.config.items[nestedViewName]
+
+    return params
+
+
+  _route: ->
+    params = @_parse_path()
+
+    if params.backToMenu
+      if @module
+        @module.activeList.scrollCache = 0
+        @module.hide()
+        @module = null
+      return
+
+    if params.moduleHasChanged
+      @module?.hide()
+      @module = params.module
+
+      # show module, root list becomes active
+      @module.show()
+      @module.activeList.updateItems()
+
+      # show nested lists
+      for listName in params.nestedListNames
+        @module.showList(listName)
+        @module.activeList.updateItems()
+
+    else
+      @module.destroyView()
+
+      for name, list of @module.nestedLists
+        # hide all lists not in the path and flush scroll cache for them
+        if params.path.indexOf(list.path) != 0
+          list.scrollCache = 0
+          list.hide()
+
+      update_active_list_items = true
+
+      # show view
+      if params.showView
+        update_active_list_items = false
+
+      # close view
+      if @module.activeList.path == params.path
+        update_active_list_items = false
+
+      # back to parent
+      if @module.activeList.path.indexOf(params.path) == 0
+        update_active_list_items = false
+
+      @module.showList(params.lastNestedListName)
+
+      if update_active_list_items
+        @module.activeList.updateItems()
+
+
+    params.config ?= @module.activeList.config
+
+    # show view
+    if params.showView
+      @module.showView(params.objectId, params.config)
+
+    @mobileListLock(params.showView)
+
+
+  # PUBLIC ================================================
+
+  mobileListLock: (showView) ->
+    if chr.isMobile()
+      @module.rootList.$el.addClass('scroll-lock')
+
+      for name, list of @module.nestedLists
+        list.$el.addClass('scroll-lock')
+
+      if ! showView
+        @module.activeList.$el.removeClass('scroll-lock')
+        $(window).scrollTop( @module.activeList.scrollCache ? 0)
+
+
+
+