angular-table 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9959d337ca7442e3599ada034d31775ecfe651ec
-  data.tar.gz: 836895bf84471fb35409242cd38ef99baad1f247
+  metadata.gz: 0300b2bec8da95a7c4f5bb5b8355f49dad326d18
+  data.tar.gz: 68aee2657f079eddb91d28480908c2f258b9032d
 SHA512:
-  metadata.gz: e8989ce7f47abf876445271e23325afb5afcd316de6e2a92270b3cc489cc0d6b8fd274e22431f1179437c2dd04767cf09f0545d17b3878af8a5c99e5bdfc8251
-  data.tar.gz: 9fddb710dfe10caf667949094061b1904012859f080266abbf045aa0c9f922914442a5dda0e14ffa3e3f1573689f7001f58089f91cf65236def80a0356716caf
+  metadata.gz: 46a472c4ddb98017d75f3d3a8aa892f8c4db07edb7ae8c78fdf313ae78b3ef6df215513f7de83b714de8d937e419d8ff3367ed3393f4148dd0207ff378b45622
+  data.tar.gz: a2a270d4de0e8d5b8aa2a7807fef71a3faffcbd6df600c87bfe91c3680f06613ea3412105d1b6df4f6c0d7e631d58bea10a90a4bcc17ede1220e35ef288c13f7

data/lib/angular-table/version.rb

@@ -1,3 +1,3 @@
 module AngularTable
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/vendor/assets/javascripts/angular-table.js.coffee

@@ -23,41 +23,38 @@ angular.module("angular-table").service "attributeExtractor", () ->
 angular.module("angular-table").directive "atTable", ["attributeExtractor", (attributeExtractor) ->
 
   capitaliseFirstLetter = (string) ->
-    string.charAt(0).toUpperCase() + string.slice(1)
-
-  constructHeader = (element) ->
-    thead = element.find "thead"
-
-    if thead[0]
-      tr = thead.find "tr"
-      existing_ths = {}
-      for th in tr.find "th"
-        th = angular.element(th)
-        existing_ths[th.attr("attribute")] = th.html()
-
-      tr.remove()
-      tr = $("<tr></tr>")
-
-      tds = element.find("td")
-      for td in tds
-        td = angular.element(td)
-        attribute = attributeExtractor.extractAttribute(td)
-        th = $("<th style='cursor: pointer; -webkit-user-select: none;'></th>")
-        title = existing_ths[attribute] || capitaliseFirstLetter(attributeExtractor.extractTitle(td))
-        th.html("#{title}")
-
-        sortable = td[0].attributes.sortable || attributeExtractor.isSortable(td.attr("class"))
-        if sortable
-          th.attr("ng-click", "predicate = '#{attribute}'; descending = !descending;")
-          icon = angular.element("<i style='margin-left: 10px;'></i>")
-          icon.attr("ng-class", "getSortIcon('#{attribute}')")
-          th.append(icon)
-
-        width = attributeExtractor.extractWidth(td.attr("class"))
-        th.attr("width", width)
-        tr.append(th)
-
-      thead.append tr
+    if string then string.charAt(0).toUpperCase() + string.slice(1) else ""
+
+
+  constructHeader = (thead, tds) ->
+    tr = thead.find "tr"
+    existingThMarkup = {}
+    for th in tr.find "th"
+      th = angular.element(th)
+      existingThMarkup[th.attr("attribute")] = th.html()
+
+    tr.remove()
+    tr = angular.element("<tr></tr>")
+
+    for td in tds
+      td = angular.element(td)
+      attribute = attributeExtractor.extractAttribute(td)
+      th = angular.element("<th style='cursor: pointer;'></th>")
+      title = existingThMarkup[attribute] || capitaliseFirstLetter(attributeExtractor.extractTitle(td))
+      th.html("#{title}")
+
+      sortable = td[0].attributes.sortable || attributeExtractor.isSortable(td.attr("class"))
+      if sortable
+        th.attr("ng-click", "predicate = '#{attribute}'; descending = !descending;")
+        icon = angular.element("<i style='margin-left: 10px;'></i>")
+        icon.attr("ng-class", "getSortIcon('#{attribute}')")
+        th.append(icon)
+
+      width = attributeExtractor.extractWidth(td.attr("class"))
+      th.attr("width", width)
+      tr.append(th)
+
+    thead.append tr
 
   validateInput = (attributes) ->
     if attributes.pagination and attributes.list
@@ -72,8 +69,11 @@ angular.module("angular-table").directive "atTable", ["attributeExtractor", (att
     tbody
 
 
+  orderByExpression = "| orderBy:predicate:descending"
+  limitToExpression = "| limitTo:fromPage() | limitTo:toPage()"
+
   StandardSetup = (attributes) ->
-    @repeatString = "item in #{attributes.list} | orderBy:predicate:descending"
+    @repeatString = "item in #{attributes.list} #{orderByExpression}"
     @compile = (element, attributes, transclude) ->
       setupTr element, @repeatString
 
@@ -81,7 +81,15 @@ angular.module("angular-table").directive "atTable", ["attributeExtractor", (att
     return
 
   PaginationSetup = (attributes) ->
-    @repeatString = "item in #{attributes.pagination}.list | limitTo:fromPage() | limitTo:toPage() | orderBy:predicate:descending"
+
+    sortContext = attributes.sortContext || "global"
+
+    if sortContext == "global"
+      @repeatString = "item in #{attributes.pagination}.list #{orderByExpression} #{limitToExpression}"
+    else if sortContext == "page"
+      @repeatString = "item in #{attributes.pagination}.list #{limitToExpression} #{orderByExpression} "
+    else
+      throw "Invalid sort-context: #{sortContext}."
 
     @compile = (element, attributes, transclude) ->
       tbody = setupTr element, @repeatString
@@ -90,7 +98,7 @@ angular.module("angular-table").directive "atTable", ["attributeExtractor", (att
         tds = element.find("td")
         tdString = ""
         for td in tds
-          tdString += "<td>{{item}}&nbsp;</td>"
+          tdString += "<td>&nbsp;</td>"
 
         fillerTr = angular.element("<tr>#{tdString}</tr>")
         fillerTr.attr("ng-repeat", "item in #{attributes.pagination}.getFillerArray() ")
@@ -120,7 +128,11 @@ angular.module("angular-table").directive "atTable", ["attributeExtractor", (att
     scope: true
     compile: (element, attributes, transclude) ->
       setup = createSetup attributes
-      constructHeader(element)
+
+      thead = element.find "thead"
+      tds = element.find "td"
+      constructHeader(thead, tds) if thead[0]
+
       setup.compile(element, attributes, transclude)
       {
         post: ($scope, $element, $attributes) ->
@@ -196,7 +208,6 @@ angular.module("angular-table").directive "atPagination", ["attributeExtractor",
           else
             []
 
-
       $scope.goToPage = (page) ->
         page = Math.max(0, page)
         page = Math.min($scope.numberOfPages - 1, page)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: angular-table
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Samuel Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler