pari: branch pari/dahdi_support r4454 - in /team/pari/dahdi_support: ./ confi...
SVN commits to the Asterisk-GUI project
asterisk-gui-commits at lists.digium.com
Mon Jan 19 15:52:56 CST 2009
Author: pari
Date: Mon Jan 19 15:52:56 2009
New Revision: 4454
URL: http://svn.digium.com/svn-view/asterisk-gui?view=rev&rev=4454
Log:
Merged revisions 4077-4079,4081,4083,4085,4089-4090,4101,4104,4106,4111-4113,4115-4121,4123,4129-4130,4132,4134-4137,4148-4149,4151,4153,4155,4159-4160,4162,4164-4187,4195,4197-4201,4205,4211-4212,4215-4217,4219,4221-4224,4229-4230,4233-4240,4242,4244,4251-4252,4268,4270,4273,4276-4278,4281-4291,4293-4296,4301,4303-4305,4307-4308,4310,4313-4321,4334-4335,4337,4339-4344,4346-4350,4354-4358,4362,4365-4369,4373-4374,4377,4380,4382-4388,4390,4392,4394-4397,4400-4401,4403-4406,4408-4453 via svnmerge from
https://origsvn.digium.com/svn/asterisk-gui/branches/2.0
........
r4417 | rbrindley | 2009-01-13 12:07:03 -0600 (Tue, 13 Jan 2009) | 1 line
added jquery.delegate plugin
........
r4418 | rbrindley | 2009-01-13 12:20:44 -0600 (Tue, 13 Jan 2009) | 6 lines
- removed the delegate function in js/welcome.js
- included jquery.delegate library in welcome.html
- modified welcome.html to use new delegate library
........
r4424 | pari | 2009-01-13 17:05:25 -0600 (Tue, 13 Jan 2009) | 5 lines
fix: lines[line_index] is undefined in welcome.js
........
r4425 | pari | 2009-01-13 17:26:34 -0600 (Tue, 13 Jan 2009) | 5 lines
AA50-2326: upgrade process not updating voicemenu references
........
r4432 | pari | 2009-01-14 10:35:13 -0600 (Wed, 14 Jan 2009) | 4 lines
foo!
........
r4434 | rbrindley | 2009-01-14 15:28:21 -0600 (Wed, 14 Jan 2009) | 5 lines
- replaced some hardcoded '/var/lib/asterisk/' instances with sessionData.directories.astvarlibdir
(closes issue #14242)
........
Added:
team/pari/dahdi_support/config/js/jquery.delegate-1.1.js
- copied unchanged from r4434, branches/2.0/config/js/jquery.delegate-1.1.js
Modified:
team/pari/dahdi_support/ (props changed)
team/pari/dahdi_support/config/index.html
team/pari/dahdi_support/config/js/index.js
team/pari/dahdi_support/config/js/pbx.js
team/pari/dahdi_support/config/js/welcome.js
team/pari/dahdi_support/config/welcome.html
Propchange: team/pari/dahdi_support/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: team/pari/dahdi_support/config/index.html
URL: http://svn.digium.com/svn-view/asterisk-gui/team/pari/dahdi_support/config/index.html?view=diff&rev=4454&r1=4453&r2=4454
==============================================================================
--- team/pari/dahdi_support/config/index.html (original)
+++ team/pari/dahdi_support/config/index.html Mon Jan 19 15:52:56 2009
@@ -3,7 +3,7 @@
*
* Top level index page
*
- * Copyright (C) 2008, Digium, Inc.
+ * Copyright (C) 2009, Digium, Inc.
*
* Pari Nannapaneni <pari at digium.com>
*
@@ -278,7 +278,7 @@
</div>
<div class="copyrights">
- Copyright 2006-2008 Digium, Inc. Digium and Asterisk are registered <a href="http://www.digium.com/en/company/view-policy.php?id=Trademark-Policy" target='_blank'>trademarks</a> of
+ Copyright 2006-2009 Digium, Inc. Digium and Asterisk are registered <a href="http://www.digium.com/en/company/view-policy.php?id=Trademark-Policy" target='_blank'>trademarks</a> of
Digium, Inc. All Rights Reserved. <i><a href="http://www.digium.com/en/company/policies.php" target="_blank" id='mainPageLegaInfo_A'>Legal Information</a></i>
<div id='parent_div_guiVersion'></div>
</div>
Modified: team/pari/dahdi_support/config/js/index.js
URL: http://svn.digium.com/svn-view/asterisk-gui/team/pari/dahdi_support/config/js/index.js?view=diff&rev=4454&r1=4453&r2=4454
==============================================================================
--- team/pari/dahdi_support/config/js/index.js (original)
+++ team/pari/dahdi_support/config/js/index.js Mon Jan 19 15:52:56 2009
@@ -503,10 +503,10 @@
if( tmp_enableOverLay.isAstTrue() ){
var tmp_overlay_dir = '';
if( sessionData.PLATFORM.isAA50 ){
- tmp_overlay_dir = 'mkdir -p /var/lib/asterisk/sounds/asteriskoverlay' ;
+ tmp_overlay_dir = 'mkdir -p '+sessionData.directories.astvarlibdir+'/sounds/asteriskoverlay' ;
}
if( sessionData.PLATFORM.isABE ){
- tmp_overlay_dir = 'mkdir -p /var/lib/asterisk/gui-overlay' ;
+ tmp_overlay_dir = 'mkdir -p '+sessionData.directories.astvarlibdir+'/gui-overlay' ;
}
ASTGUI.systemCmd( tmp_overlay_dir , function(){
top.window.location.href = this_mainURL.withOut( 'overlay=' );
Modified: team/pari/dahdi_support/config/js/pbx.js
URL: http://svn.digium.com/svn-view/asterisk-gui/team/pari/dahdi_support/config/js/pbx.js?view=diff&rev=4454&r1=4453&r2=4454
==============================================================================
--- team/pari/dahdi_support/config/js/pbx.js (original)
+++ team/pari/dahdi_support/config/js/pbx.js Mon Jan 19 15:52:56 2009
@@ -2135,6 +2135,29 @@
// [voicemenus]
// exten = 7000,1,Goto(voicemenu-custom-1|s|1)
sa.new_action('append', ASTGUI.contexts.VoiceMenuExtensions , 'exten', match_str );
+
+ var tmp_exten = ASTGUI.parseContextLine.getExten(match_str);
+ var tmp_oldVM_gotoStr = ASTGUI.parseContextLine.getAppWithArgs(match_str);
+ for ( var catname in ext_conf ){
+ if( !ext_conf.hasOwnProperty(catname) ) continue;
+ if( catname.beginsWith('DID_') ){
+ if( catname.contains( '_' + ASTGUI.contexts.TimeIntervalPrefix ) || catname.endsWith(ASTGUI.contexts.TrunkDefaultSuffix) ){ continue; }
+ }else if( catname.beginsWith('voicemenu-custom-') ){
+
+ }else{
+ continue;
+ }
+
+ var this_menu = ext_conf[catname] ;
+ this_menu.each( function( this_menu_line ){
+ if( this_menu_line.contains( tmp_oldVM_gotoStr ) ){
+ var tmp_toReplace = this_menu_line.afterChar('=');
+ var tmp_ReplaceWith = tmp_toReplace.replaceXY( tmp_oldVM_gotoStr, 'Goto(' + ASTGUI.contexts.VoiceMenuExtensions + ',' + tmp_exten + ',1)' );
+ sa.new_action( 'update', catname , 'exten', tmp_ReplaceWith , tmp_toReplace );
+ }
+ });
+ }
+
return;
}
Modified: team/pari/dahdi_support/config/js/welcome.js
URL: http://svn.digium.com/svn-view/asterisk-gui/team/pari/dahdi_support/config/js/welcome.js?view=diff&rev=4454&r1=4453&r2=4454
==============================================================================
--- team/pari/dahdi_support/config/js/welcome.js (original)
+++ team/pari/dahdi_support/config/js/welcome.js Mon Jan 19 15:52:56 2009
@@ -324,6 +324,7 @@
}
}
+ if( !lines[line_index] ) lines[line_index] = '';
//line #2 (index=1) will either be 'Members:' or 'No Members'
if (lines[line_index].contains('Members:')) {
line_index++;
@@ -1042,15 +1043,3 @@
}
new_row.appendTo(tbody);
};
-
- jQuery.delegate = function(rules) {
- return function(e) {
- var target = $(e.target);
-
- for (var selector in rules) {
- if (target.is(selector)) {
- return rules[selector].apply(this, $.makeArray(arguments));
- }
- }
-}
-};
Modified: team/pari/dahdi_support/config/welcome.html
URL: http://svn.digium.com/svn-view/asterisk-gui/team/pari/dahdi_support/config/welcome.html?view=diff&rev=4454&r1=4453&r2=4454
==============================================================================
--- team/pari/dahdi_support/config/welcome.html (original)
+++ team/pari/dahdi_support/config/welcome.html Mon Jan 19 15:52:56 2009
@@ -360,6 +360,7 @@
<script type="text/javascript" src="js/jquery.ui.draggable.js"></script>
<script type="text/javascript" src="js/jquery.ui.sortable.js"></script>
<script type="text/javascript" src="js/jquery.ui.tabs.js"></script>
+<script type="text/javascript" src="js/jquery.delegate-1.1.js"></script>
<script type="text/javascript" src="js/jquery.tablesorter.js"></script>
<script type="text/javascript" src="js/jquery.tablesorter.pager.js"></script>
<script type="text/javascript" src="js/astman.js"></script>
@@ -419,36 +420,38 @@
getsysinfohtml(); //pre-load general information as its not automatically triggered
/* Event Delegation */
- $('body').click( $.delegate({
- '.minimaxi': function (e) {
- $(e.target).parent().parent().children(".body").toggle();
- if ($(e.target).html() == "[ - ]") {
- $(e.target).html("[ + ]");
+ $('body')
+ .delegate('click','.minimaxi', function () {
+ $(this).parent().parent().children(".body").toggle();
+ if ($(this).html() == "[ - ]") {
+ $(this).html("[ + ]");
} else {
- $(e.target).html("[ - ]");
+ $(this).html("[ - ]");
}
- },
- 'img.loadTrunks': function (e) {
+ return false;
+ })
+ .delegate('click','img.loadTrunks', function () {
loadTrunks();
- },
- 'img.loadQueues': function (e) {
+ return false;
+ })
+ .delegate('click','img.loadQueues', function () {
loadQueues();
- }
- }));
- $('#extensions_sections').click( $.delegate({
- '.section': function (e) {
+ return false;
+ });
+ $('#extensions_sections')
+ .delegate('click','.section', function () {
var title;
- if ( (title = $(e.target).attr('title')) != 'all') {
+ if ( (title = $(this).attr('title')) != 'all') {
//set all to inactive
- $(e.target).siblings('span:first[title=all]').removeClass('active');
+ $(this).siblings('span:first[title=all]').removeClass('active');
extension_loads['all'] = false;
//toggle active for title
- var has_class = $(e.target).toggleClass('active').hasClass('active');
+ var has_class = $(this).toggleClass('active').hasClass('active');
extension_loads[title] = has_class?true:false;
//traverse sections and show or hide appropriately
- $(e.target).siblings('[title!=all]').andSelf().each( function() {
+ $(this).siblings('[title!=all]').andSelf().each( function() {
var show = $(this).hasClass('active');
var title = $(this).attr('title');
@@ -463,8 +466,8 @@
$('#extensions_list .sip.iax').show();
}
} else {
- $(e.target).addClass('active');
- $(e.target).siblings('span').each( function() {
+ $(this).addClass('active');
+ $(this).siblings('span').each( function() {
$(this).removeClass('active');
var title = $(this).attr('title');
extension_loads[title] = false;
@@ -472,10 +475,9 @@
$('#extensions_list').find('.sip, .iax, .analog, .feature').show();
}
- var title = $(e.target).attr('title');
+ var title = $(this).attr('title');
extension_loads[title] = extension_loads[title]?true:false;
- }
- }));
+ });
setTimeout(loadTrunks, 1);
loadExtensions();
More information about the asterisk-gui-commits
mailing list