[Jifty-commit] jifty branch, jifty_client, updated. fd3bd7d991ff35a0041bfdcf10a908c7b1d9dd08

Jifty commits jifty-commit at lists.jifty.org
Mon May 3 12:07:40 EDT 2010


The branch, jifty_client has been updated
       via  fd3bd7d991ff35a0041bfdcf10a908c7b1d9dd08 (commit)
      from  42c1749bf4f21a7a0faafb0b7680f47ee416f367 (commit)

Summary of changes:
 lib/Jifty/Plugin/REST/Dispatcher.pm |    3 +--
 share/web/static/js/jifty_client.js |    8 ++------
 2 files changed, 3 insertions(+), 8 deletions(-)

- Log -----------------------------------------------------------------
commit fd3bd7d991ff35a0041bfdcf10a908c7b1d9dd08
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Tue May 4 00:07:41 2010 +0800

    Can't really apply roles to attributes, so use a property instead

diff --git a/lib/Jifty/Plugin/REST/Dispatcher.pm b/lib/Jifty/Plugin/REST/Dispatcher.pm
index 66e8a29..049090d 100644
--- a/lib/Jifty/Plugin/REST/Dispatcher.pm
+++ b/lib/Jifty/Plugin/REST/Dispatcher.pm
@@ -958,7 +958,7 @@ sub show_joose_class {
         next if $col->private or $col->virtual;
 
         my $props = {
-            does => 'JiftyColumn',
+            jiftyColumn => 1,
         };
 
         # map Jifty column property names to Joose names
@@ -1014,7 +1014,6 @@ sub show_joose_class {
     # better ideas welcome...
     $class_definition =~ s/"isa":"JiftyModel"/"isa":JiftyModel/g;
     $class_definition =~ s/"isa":"Joose\.Type\.(\w+)"/"isa":Joose.Type.$1/g;
-    $class_definition =~ s/"does":"JiftyColumn"/"does":JiftyColumn/g;
 
     return $class_definition;
 }
diff --git a/share/web/static/js/jifty_client.js b/share/web/static/js/jifty_client.js
index 8a5fd1f..689f6c0 100644
--- a/share/web/static/js/jifty_client.js
+++ b/share/web/static/js/jifty_client.js
@@ -25,9 +25,9 @@ Class("JiftyModel", {
             }
 
             Joose.O.eachSafe(this.meta.getAttributes(), function (attr, name) {
-                if (attr.meta.does(JiftyColumn)) {
+                if (attr.getProps().jiftyColumn) {
                     if (record[name] != original[name]) {
-                        diff[field] = record[field];
+                        diff[name] = record[name];
                     }
                 }
             });
@@ -55,10 +55,6 @@ Class("JiftyModel", {
     }
 });
 
-// no logic here yet, just here for introspection
-Role("JiftyColumn", {
-});
-
 Class("JiftyClient", {
     has: {
         baseUrl: {

-----------------------------------------------------------------------


More information about the Jifty-commit mailing list