Changeset 769308
- Timestamp:
- 09/09/2013 07:31:18 PM (13 years ago)
- Location:
- siteapps/trunk
- Files:
-
- 2 edited
-
css/style-admin.css (modified) (1 diff)
-
views/widgets/onload.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
siteapps/trunk/css/style-admin.css
r764932 r769308 90 90 .wpbar{ color: #fff } 91 91 .wpbar span{ display: inline-block; padding-left: 20px; } 92 .wpbar a.logo{ display: block; float: right; width: 126px; height: 23px; background: url(/wp-content/plugins/siteapps/images/salogo.png) ; background-size: contain; position: relative; top: 3px; }92 .wpbar a.logo{ display: block; float: right; width: 126px; height: 23px; background: url(/wp-content/plugins/siteapps/images/salogo.png) no-repeat; background-size: contain; position: relative; top: 3px; } 93 93 94 94 .wpbar_grad1{ background: #3d3d3d; /* Old browsers */background: -moz-linear-gradient(top, #3d3d3d 0%, #191919 100%); /* FF3.6+ */background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#3d3d3d), color-stop(100%,#191919)); /* Chrome,Safari4+ */background: -webkit-linear-gradient(top, #3d3d3d 0%,#191919 100%); /* Chrome10+,Safari5.1+ */background: -o-linear-gradient(top, #3d3d3d 0%,#191919 100%); /* Opera 11.10+ */background: -ms-linear-gradient(top, #3d3d3d 0%,#191919 100%); /* IE10+ */background: linear-gradient(to bottom, #3d3d3d 0%,#191919 100%); /* W3C */filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#3d3d3d', endColorstr='#191919',GradientType=0 ); /* IE6-9 */ } -
siteapps/trunk/views/widgets/onload.php
r768705 r769308 25 25 26 26 var userSegments = segments 27 , expressionForEval = expression.replace(/\s+and\s+/ig, '&&').replace(/\s+or\s+/ig, '||') 27 , expressionForEval = expression.replace(/\s+and\s+/ig, '&&').replace(/\s+or\s+/ig, '||').replace(/not/ig, '!') 28 28 , regex = null 29 29 , i = 0; 30 30 31 var tokensMy = expression ForEval.replace(/\(/g, "").replace(/\)/g, "").replace(/\&\&/g, ' ').replace(/\|\|/g, '');32 var allSegments = tokensMy. split(' ');31 var tokensMy = expression.replace(/\(/g, "").replace(/\)/g, "").replace(/\s+and\s+/ig, ' ').replace(/\s+or\s+/ig, ' ').replace(/not/ig, ''); 32 var allSegments = tokensMy.trim().split(' '); 33 33 34 34 for(var s in allSegments) { … … 40 40 regex = new RegExp(allSegments[s], 'ig'); 41 41 expressionForEval = expressionForEval.replace(regex, replacement); 42 // consoleWrite('expression with : '+ allSegments[s], expressionForEval); 42 43 } 43 44 consoleWrite('expression: ' , expressionForEval); … … 75 76 for (var ex in expressionsToShow) { 76 77 var expression = expressionsToShow[ex]; 77 consoleWrite('expression : ', expression);78 consoleWrite('expression pure: ', expression); 78 79 consoleWrite('widget: ', ex); 79 80 var show = mustRunWidget(segments, expression);
Note: See TracChangeset
for help on using the changeset viewer.