Changeset 588

Timestamp:

04/15/09 20:44:35 (3 years ago)

Author:

jf.hovinne

Message:

Fixed CSS parsing. Added wym_box_ class name.

Location:

trunk/src

Files:

• test/wym_stylesheet.css (modified) (4 diffs)
• wymeditor/jquery.wymeditor.js (modified) (5 diffs)

trunk/src/test/wym_stylesheet.css

@@ -19 +19 @@
 
 /* PARA: Date */
-.date p{
+p.date {
   color: #ccf;
   /* background-color: #ff9; border: 2px solid #ee9; */
@@ -25 +25 @@
 
 /* PARA: Hidden note */
-.hidden-note p /* p[@class!="important"] */ {
+p.hidden-note /* p[@class!="important"] */ {
      display: none;
     /* color: #999; border: 2px solid #ccc; */
@@ -31 +31 @@
 
 /* PARA: Important */
-.important p /* p[@class!="hidden-note"] */ {
+p.important /* p[@class!="hidden-note"] */ {
     color: red; font-weight: bold;
     /* color: red; font-weight: bold; border: 2px solid red; */
 }
 
-.border img {
+img.border {
     border: 1px solid #ccc;
     /* border: 4px solid #ccc; */
@@ -42 +42 @@
 
 /* LIST: Special */
-.special ul,
-.special ol {
+ul.special,
+ol.special {
     color: green;
     /** / background-color: #fc9; border: 2px solid red; /**/

trunk/src/wymeditor/jquery.wymeditor.js

@@ -735 +735 @@
 
       //load wymbox
-      this._box = jQuery(this._element).hide().after(this._options.boxHtml).next();
+      this._box = jQuery(this._element).hide().after(this._options.boxHtml).next().addClass('wym_box_' + this._index);
 
       //store the instance index in the wymbox element
@@ -3581 +3581 @@
   }
 
-  this.addSpecialPattern("\\\x2e[a-z-_0-9]+[\\sa-z1-6]*", 'WymCss', 'WymCssStyleDeclaration');
+  this.addSpecialPattern("[\\sa-z1-6]*\\\x2e[a-z-_0-9]+", 'WymCss', 'WymCssStyleDeclaration');
 
   this.addEntryPattern("/\\\x2a", 'WymCss', 'WymCssComment');
@@ -3589 +3589 @@
   this.addExitPattern("\x7d", 'WymCssStyle');
 
-  this.addEntryPattern("/\\\x2a", 'WymCssStyle', 'WymCssFeddbackStyle');
-  this.addExitPattern("\\\x2a/", 'WymCssFeddbackStyle');
+  this.addEntryPattern("/\\\x2a", 'WymCssStyle', 'WymCssFeedbackStyle');
+  this.addExitPattern("\\\x2a/", 'WymCssFeedbackStyle');
 
   return this;
@@ -3654 +3654 @@
 };
 
-WYMeditor.WymCssParser.prototype.WymCssFeddbackStyle = function(match, status)
+WYMeditor.WymCssParser.prototype.WymCssFeedbackStyle = function(match, status)
 {
   if(status == WYMeditor.LEXER_UNMATCHED){
@@ -3667 +3667 @@
 
   var tag = '';
-  if(match.indexOf(' ') > 0){
-    var parts = match.split(' ');
-    this._current_element = parts[0];
-    var tag = parts[1];
+  if(match.indexOf('.') > 0){
+    var parts = match.split('.');
+    this._current_element = parts[1];
+    var tag = parts[0];
   }else{
     this._current_element = match;