Changeset 10611 for modules/branches/2.9/core

Timestamp:

11/23/10 15:19:53 (2 years ago)

Author:

p_lindheimer

Message:

fixes #4453 and fixes #4563 javascript running too long with many dial patterns, did not use pageination patch provided in #4563, insteady, only the first 50 entries have toggleval applied to them, all the others will be updated onmouseover to see what the filed it so if you scroll down past 50 entries, they will simply be blank if not filled in

Files:

• modules/branches/2.9/core/page.routing.php (modified) (8 diffs)
• modules/branches/2.9/core/page.trunks.php (modified) (8 diffs)

modules/branches/2.9/core/page.routing.php

@@ -534 +534 @@
-  $mp_tit = _("match pattern");
-  $ci_tit = _("CallerId");
+
+  $dpt_title_class = 'dpt-title dpt-display';
-  foreach ($dialpattern_array as $idx => $pattern) {
-    $tabindex++;
-
+
+
+
+
-    echo <<< END
-    <tr>
@@ -543 +548 @@
-END;
-    $tabindex++;
-'dpt-title'
+$dpt_title_class
-    echo <<< END
-        <input title="$pf_tit" type="text" size="6" id="pattern_prefix_$idx" name="pattern_prefix[$idx]" class="$dpt_class" value="{$pattern['match_pattern_prefix']}" tabindex="$tabindex"> |
-END;
-    $tabindex++;
-'dpt-title'
+$dpt_title_class
-    echo <<< END
-        [<input title="$mp_tit" type="text" size="16" id="pattern_pass_$idx" name="pattern_pass[$idx]" class="$dpt_class" value="{$pattern['match_pattern_pass']}" tabindex="$tabindex"> /
-END;
-    $tabindex++;
-'dpt-title'
+$dpt_title_class
-    echo <<< END
-        <input title="$ci_tit" type="text" size="10" id="match_cid_$idx" name="match_cid[$idx]" class="$dpt_class" value="{$pattern['match_cid']}" tabindex="$tabindex">]
@@ -567 +572 @@
-    <tr>
-      <td colspan="2">
-
-
-
-
+ dpt-display
+ dpt-display
+ dpt-display
+ dpt-display
-        <img src="images/trash.png" style="float:none; margin-left:0px; margin-bottom:-3px;cursor:pointer;" alt="<?php echo _("remove")?>" title="<?php echo _("Click here to remove this pattern")?>" onclick="patternsRemove(<?php echo _("$next_idx") ?>)">
-
@@ -777 +782 @@
-    addCustomField('','','','');
-  });
-title
+display
-    populateFrom: "title",
-    changedClass: "text-normal",
-    focusClass: "text-normal"
+  });
+  $(".dpt-nodisplay").mouseover(function(){
+    $(this).toggleVal({
+      populateFrom: "title",
+      changedClass: "text-normal",
+      focusClass: "text-normal"
+    }).removeClass('dpt-nodisplay').addClass('dpt-display').unbind('mouseover');
-  });
-}); 
@@ -795 +807 @@
-  var tabindex2 = tabindex + 3;
-  var tabindex3 = tabindex + 4;
-
-
-
-
+
+
+
+
+
-
-  var new_insert = $("#last_row").before('\
@@ -880 +893 @@
-
-function clearPatterns() {
-title
+display
-    if($(this).val() == $(this).data("defText")) {
-      $(this).val("");
@@ -894 +907 @@
-  defaultEmptyOK = false;
-
-title
+display
-    if ($.trim($(this).val()) == '') {
-    } else if (!isDialpattern($(this).val())) {
@@ -913 +926 @@
-    // now we have to put it back...
-    // do I have to turn it off first though?
-title
+display
-      if ($.trim($(this).val()) == '') {
-        $(this).toggleVal({

modules/branches/2.9/core/page.trunks.php

@@ -571 +571 @@
-  $pf_tit = _("prefix");
-  $mp_tit = _("match pattern");
+  $dpt_title_class = 'dpt-title dpt-display';
-  foreach ($dialpattern_array as $idx => $pattern) {
-    $tabindex++;
-
+
+
+
+
-    echo <<< END
-    <tr>
@@ -580 +584 @@
-END;
-    $tabindex++;
-'dpt-title'
+$dpt_title_class
-    echo <<< END
-        <input title="$pf_tit" type="text" size="6" id="pattern_prefix_$idx" name="pattern_prefix[$idx]" class="dp-prefix $dpt_class" value="{$pattern['match_pattern_prefix']}" tabindex="$tabindex"> |
-END;
-    $tabindex++;
-'dpt-title'
+$dpt_title_class
-    echo <<< END
-        <input title="$mp_tit" type="text" size="16" id="pattern_pass_$idx" name="pattern_pass[$idx]" class="dp-match $dpt_class" value="{$pattern['match_pattern_pass']}" tabindex="$tabindex">
@@ -599 +603 @@
-    <tr>
-      <td colspan="2">
-
-
-
+ dpt-display
+ dpt-display
+ dpt-display
-        <img src="images/trash.png" style="cursor:pointer; float:none; margin-left:0px; margin-bottom:-3px;" alt="<?php echo _("remove")?>" title="<?php echo _("Click here to remove this pattern")?>" onclick="patternsRemove(<?php echo _("$next_idx") ?>)">
-
@@ -918 +922 @@
-    clearAllPatterns();
-  });
-title
+display
-    populateFrom: "title",
-    changedClass: "text-normal",
-    focusClass: "text-normal"
+  });
+  $(".dpt-nodisplay").mouseover(function(){
+    $(this).toggleVal({
+      populateFrom: "title",
+      changedClass: "text-normal",
+      focusClass: "text-normal"
+    }).removeClass('dpt-nodisplay').addClass('dpt-display').unbind('mouseover');
-  });
-}); 
@@ -935 +946 @@
-  var tabindex1 = tabindex + 2;
-  var tabindex2 = tabindex + 3;
-
-
-
+
+
+
+
-
-  var new_insert = $("#last_row").before('\
@@ -960 +972 @@
-
-function clearPatterns() {
-title
+display
-    if($(this).val() == $(this).data("defText")) {
-      $(this).val("");
@@ -969 +981 @@
-
-function clearAllPatterns() {
-
-
+
+
+
+
+
+
+
+
-    $(this).val("");
-  });
-
-
-
-
-
+
-  return true;
-}
@@ -1029 +1043 @@
-    // now we have to put it back...
-    // do I have to turn it off first though?
-title
+display
-      if ($.trim($(this).val()) == '') {
-        $(this).toggleVal({