[Jifty-commit] r795 - in jifty/trunk: share/web/static/js

[jifty-commit at lists.jifty.org]

Author: autrijus
Date: Sun Apr  2 06:51:15 2006
New Revision: 795

Modified:
   jifty/trunk/doc/talks/takahashi.css
   jifty/trunk/doc/talks/takahashi.js
   jifty/trunk/doc/talks/yapc.asia.2006.xul
   jifty/trunk/share/web/static/js/rico.js

Log:
* oops. revert the extra bogus commits.
  (the last commit also fixed RPS::I18N to _AUTO fallback
   on non-english languages, as well as turn on "use utf8"
   for all compoments so that textual utf8 works there.)
  Because of this change, :utf8 is now turned on again
  on the Mason view.

Modified: jifty/trunk/doc/talks/takahashi.css
==============================================================================
--- jifty/trunk/doc/talks/takahashi.css	(original)
+++ jifty/trunk/doc/talks/takahashi.css	Sun Apr  2 06:51:15 2006
@@ -173,9 +173,8 @@
     text-align: center;
     font-size: 40px;
     background: black;
-    height: auto;
+    bottom: 10;
     padding-bottom: 10px;
     padding-top: 10px;
-    margin: 0px;
     spacing: 10px;
 }

Modified: jifty/trunk/doc/talks/takahashi.js
==============================================================================
--- jifty/trunk/doc/talks/takahashi.js	(original)
+++ jifty/trunk/doc/talks/takahashi.js	Sun Apr  2 06:51:15 2006
@@ -9,6 +9,9 @@
         this.deck     = document.getElementById('deck');
         this.scroller = document.getElementById('scroller');
 
+               this.canvas.appendChild(document.createElement('description'));
+               this.canvas.lastChild.setAttribute('id', "caption");
+               this.canvas.lastChild.setAttribute('class', 'subtitle');
         this.toolbar         = document.getElementById('canvasToolbar');
         this.toolbarHeight   = this.toolbar.boxObject.height;
         this.isToolbarHidden = true;
@@ -72,8 +75,6 @@
 
 
         var labelId = 0;
-        var subtitle = '';
-        var subtitle2 = '';
 
         for (var i = 0; i < text.length; i++)
         {
@@ -84,14 +85,10 @@
             line = text[i];
             image_width  = 0;
             image_height = 0;
+            var subtitle = '';
 
             if (line.match(/^~/)) {
-              if (subtitle) {
-               subtitle2 = line.substring(1);
-              }
-              else {
-               subtitle = line.substring(1);
-              }
+              subtitle = line.substring(1);
               line = '';
             }
 
@@ -160,7 +157,6 @@
 
         this.content.setAttribute('style', 'font-size:10px;');
           caption =  document.getElementById('caption');
-          caption2 =  document.getElementById('caption2');
         if (subtitle) {
                caption.setAttribute('value', subtitle);
         } else {
@@ -168,13 +164,6 @@
 
         }
 
-        if (subtitle2) {
-               caption2.setAttribute('value', subtitle2);
-        } else {
-               caption2.setAttribute('value', '');
-
-        }
-
         if (this.content.boxObject.width) {
             var canvas_w  = this.canvas.boxObject.width;
             var canvas_h  = this.canvas.boxObject.height-image_total_height;

Modified: jifty/trunk/doc/talks/yapc.asia.2006.xul
==============================================================================
--- jifty/trunk/doc/talks/yapc.asia.2006.xul	(original)
+++ jifty/trunk/doc/talks/yapc.asia.2006.xul	Sun Apr  2 06:51:15 2006
@@ -14,8 +14,7 @@
 ----
 Nifty Apps
 in a Jiffy
-~ 〄 Ĵïƒƫȳ 〄
-~ あっという間にMøøse
+~ あっという間にJifty
 ----
 How we're building useful applications
 in Perl 5 with a single unified framework, 
@@ -1036,8 +1035,6 @@
 </toolbar>
 </toolbox>
 <vbox flex="1" id="canvas" onclick="Presentation.onPresentationClick(event);">
-<description id="caption" class="subtitle" />
-<description id="caption2" class="subtitle" />
 <spacer flex="1"/>
 <hbox flex="1">
 <spacer flex="1"/>

Modified: jifty/trunk/share/web/static/js/rico.js
==============================================================================
--- jifty/trunk/share/web/static/js/rico.js	(original)
+++ jifty/trunk/share/web/static/js/rico.js	Sun Apr  2 06:51:15 2006
@@ -2143,7 +2143,7 @@
 
    populateRow: function(htmlRow, row) {
       for (var j=0; j < row.length; j++) {
-         try { htmlRow.cells[j].innerHTML = row[j] } catch (e) {};
+         htmlRow.cells[j].innerHTML = row[j]
       }
    },
    
@@ -2489,9 +2489,7 @@
       var headerRow   = this.headerTable.rows[0];
       var headerCells = headerRow.cells;
       for ( var i = 0 ; i < headerCells.length ; i++ ) {
-         if (headerCells[i].tagName == 'TH') {
-           this.addSortBehaviorToColumn( i, headerCells[i] );
-         }
+         this.addSortBehaviorToColumn( i, headerCells[i] );
       }
    },
 
@@ -2586,12 +2584,7 @@
    },
 
    deriveColumnNameFromCell: function(cell,columnNumber) {
-        var cellContent = 
-            (cell.attributes.name != undefined)
-                ? cell.attributes.name.value.toString()
-                : (cell.innerText != undefined)
-                    ? cell.innerText
-                    : cell.textContent;
+      var cellContent = cell.innerText != undefined ? cell.innerText : cell.textContent;
       return cellContent ? cellContent.toLowerCase().split(' ').join('_') : "col_" + columnNumber;
    }
 };