[Rt-commit] rt branch, lcore, updated. 8866e2d237d8b3e19e133acd99202995db1d75e2

[jesse]

The branch, lcore has been updated
       via  8866e2d237d8b3e19e133acd99202995db1d75e2 (commit)
       via  9f4c77e72b8e34f9c863f7169cf9f5628f7d69aa (commit)
      from  2ec439cec7d05b500089ae43b99d8e94752a8899 (commit)

Summary of changes:
 lib/RT.pm                          |    5 ++++-
 share/web/static/js/rulebuilder.js |   18 +++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

- Log -----------------------------------------------------------------
commit 9f4c77e72b8e34f9c863f7169cf9f5628f7d69aa
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Fri Aug 7 12:55:49 2009 +0100

    we need to quote the 'class' key for safari and ie

diff --git a/share/web/static/js/rulebuilder.js b/share/web/static/js/rulebuilder.js
index 62e9193..8c874aa 100644
--- a/share/web/static/js/rulebuilder.js
+++ b/share/web/static/js/rulebuilder.js
@@ -21,10 +21,10 @@ RuleBuilder.functions = {
 
 RuleBuilder.expressions = [
     { expression: 'ticket',
-      type: 'RT::Model::Ticket',
+      type: 'RT::Model::Ticket'
     },
     { expression: 'transaction',
-      type: 'RT::Model::Transaction',
+      type: 'RT::Model::Transaction'
     }
 ];
 
@@ -33,10 +33,10 @@ RuleBuilder.prototype.init = function () {
     var ebuilder = jQuery(sel);
     var that = this;
 
-    jQuery._div({class: 'application'})
+    jQuery._div({'class': 'application'})
             ._h3_().text("New Expression")
-            ._div_({class: 'application-function'})
-            ._div_({class: 'application-params'})
+            ._div_({'class': 'application-function'})
+           ._div_({'class': 'application-params'})
           .div_()
         .appendTo(ebuilder);
 
@@ -66,7 +66,7 @@ RuleBuilder.prototype.update_expressions = function() {
 
     jQuery('div.expressions', ebuilder).remove();
 
-    jQuery._div({class: 'expressions'})
+    jQuery._div({'class': 'expressions'})
             ._h3_().text("Current Expressions")
           .div_()
         .appendTo(ebuilder);
@@ -75,9 +75,9 @@ RuleBuilder.prototype.update_expressions = function() {
 
     jQuery.each(this.expressions,
                 function(idx, val) {
-                    jQuery._div({class: 'expression ret_'+val.type})
-                            ._span_({ class: 'expression-text' }).text(val.expression)
-                            ._span_({ class: 'type' }).text(val.type)
+                    jQuery._div({'class': 'expression ret_'+val.type})
+                            ._span_({ 'class': 'expression-text' }).text(val.expression)
+                            ._span_({ 'class': 'type' }).text(val.type)
                           .div_().click(function(e) {
                         if (that.current_application_param != null) {
                             if (val.type != 

commit 8866e2d237d8b3e19e133acd99202995db1d75e2
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Fri Aug 7 12:56:17 2009 +0100

    fix the order of js libs - only useful for devel mode

diff --git a/lib/RT.pm b/lib/RT.pm
index 7e3ab84..6166d82 100644
--- a/lib/RT.pm
+++ b/lib/RT.pm
@@ -323,7 +323,10 @@ sub init_jifty {
 
     Jifty->web->add_javascript(
         qw( titlebox-state.js util.js ahah.js fckeditor.js list.js
-        combobox.js  cascaded.js rulebuilder.js jquery.createdomnodes.js )
+		jquery.createdomnodes.js 
+        combobox.js  cascaded.js rulebuilder.js 
+		
+		)
     );
 
     Jifty::Web->add_trigger(

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