Commit fbfcb3b2 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

Revert "support step elements conaining whitespaces in their IDs."

because ID should not contain whitespaces.
This reverts commit e6cd717e.
parent e6cd717e
No related merge requests found
......@@ -6,13 +6,9 @@
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Cacheable__manager_id</string> </key>
<value> <string>http_cache</string> </value>
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts93420566.82</string> </value>
<value> <string>ts54096599.77</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
......@@ -230,7 +226,7 @@
\t\t_continueToNextStep : function(){\n
\t\t\tif(this.isLastStep){\n
\t\t\t\tfor(var i = 0; i < this.activatedSteps.length; i++){\n
\t\t\t\t\tthis.steps.filter("[id=\'"+this.activatedSteps[i]+"\']").find(":input").not(".wizard-ignore").removeAttr("disabled");\n
\t\t\t\t\tthis.steps.filter("#" + this.activatedSteps[i]).find(":input").not(".wizard-ignore").removeAttr("disabled");\n
\t\t\t\t}\n
\t\t\t\tif(!this.options.formPluginEnabled){\n
\t\t\t\t\treturn true;\n
......@@ -290,8 +286,8 @@
\n
\t\t_animate : function(oldStep, newStep, stepShownCallback){\n
\t\t\tthis._disableNavigation();\n
\t\t\tvar old = this.steps.filter("[id=\'"+oldStep+"\']");\n
\t\t\tvar current = this.steps.filter("[id=\'"+newStep+"\']");\n
\t\t\tvar old = this.steps.filter("#" + oldStep);\n
\t\t\tvar current = this.steps.filter("#" + newStep);\n
\t\t\told.find(":input").not(".wizard-ignore").attr("disabled","disabled");\n
\t\t\tcurrent.find(":input").not(".wizard-ignore").removeAttr("disabled");\n
\t\t\tvar wizard = this;\n
......@@ -309,14 +305,14 @@
\n
\t\t_checkIflastStep : function(step){\n
\t\t\tthis.isLastStep = false;\n
\t\t\tif($("[id=\'"+step+"\']").hasClass(this.options.submitStepClass) || this.steps.filter(":last").attr("id") == step){\n
\t\t\tif($("#" + step).hasClass(this.options.submitStepClass) || this.steps.filter(":last").attr("id") == step){\n
\t\t\t\tthis.isLastStep = true;\n
\t\t\t}\n
\t\t},\n
\n
\t\t_getLink : function(step){\n
\t\t\tvar link = undefined;\n
\t\t\tvar links = this.steps.filter("[id=\'"+step+"\']").find(this.options.linkClass);\n
\t\t\tvar links = this.steps.filter("#" + step).find(this.options.linkClass);\n
\n
\t\t\tif(links != undefined){\n
\t\t\t\tif(links.filter(":radio,:checkbox").size() > 0){\n
......@@ -331,12 +327,12 @@
\t\t_navigate : function(step){\n
\t\t\tvar link = this._getLink(step);\n
\t\t\tif(link != undefined){\n
\t\t\t\tif((link != "" && link != null && link != undefined) && this.steps.filter("[id=\'"+link+"\']").attr("id") != undefined){\n
\t\t\t\tif((link != "" && link != null && link != undefined) && this.steps.filter("#" + link).attr("id") != undefined){\n
\t\t\t\t\treturn link;\n
\t\t\t\t}\n
\t\t\t\treturn this.currentStep;\n
\t\t\t}else if(link == undefined && !this.isLastStep){\n
\t\t\t\tvar step1 = this.steps.filter("[id=\'"+step+"\']").next().attr("id");\n
\t\t\t\tvar step1 = this.steps.filter("#" + step).next().attr("id");\n
\t\t\t\treturn step1;\n
\t\t\t}\n
\t\t},\n
......@@ -375,7 +371,7 @@
\t\t\tthis.element.resetForm()\n
\t\t\t$("label,:input,textarea",this).removeClass("error");\n
\t\t\tfor(var i = 0; i < this.activatedSteps.length; i++){\n
\t\t\t\tthis.steps.filter("[id=\'"+this.activatedSteps[i]+"\']").hide().find(":input").attr("disabled","disabled");\n
\t\t\t\tthis.steps.filter("#" + this.activatedSteps[i]).hide().find(":input").attr("disabled","disabled");\n
\t\t\t}\n
\t\t\tthis.activatedSteps = new Array();\n
\t\t\tthis.previousStep = undefined;\n
......@@ -455,7 +451,7 @@
\t\tupdate_steps : function(){\n
\t\t\tthis.steps = this.element.find(".step").addClass("ui-formwizard-content");\n
\t\t\tthis.firstStep = this.steps.eq(0).attr("id");\n
\t\t\tthis.steps.not("[id=\'"+this.currentStep+"\']").hide().find(":input").addClass("ui-wizard-content").attr("disabled","disabled");\n
\t\t\tthis.steps.not("#" + this.currentStep).hide().find(":input").addClass("ui-wizard-content").attr("disabled","disabled");\n
\t\t\tthis._checkIflastStep(this.currentStep);\n
\t\t\tthis._enableNavigation();\n
\t\t\tif(!this.options.disableUIStyles){\n
......@@ -500,7 +496,7 @@
</item>
<item>
<key> <string>size</string> </key>
<value> <int>14390</int> </value>
<value> <int>14327</int> </value>
</item>
<item>
<key> <string>title</string> </key>
......
......@@ -6,13 +6,9 @@
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Cacheable__manager_id</string> </key>
<value> <string>http_cache</string> </value>
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts93420527.14</string> </value>
<value> <string>ts55496452.04</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
......@@ -26,6 +22,7 @@
<key> <string>data</string> </key>
<value> <string encoding="cdata"><![CDATA[
\n
(function($){$.widget("ui.formwizard",{_init:function(){var wizard=this;var formOptionsSuccess=this.options.formOptions.success;var formOptionsComplete=this.options.formOptions.complete;var formOptionsBeforeSend=this.options.formOptions.beforeSend;var formOptionsBeforeSubmit=this.options.formOptions.beforeSubmit;var formOptionsBeforeSerialize=this.options.formOptions.beforeSerialize;this.options.formOptions=$.extend(this.options.formOptions,{success:function(responseText,textStatus,xhr){if(formOptionsSuccess){formOptionsSuccess(responseText,textStatus,xhr);}\n
if(wizard.options.formOptions&&wizard.options.formOptions.resetForm||!wizard.options.formOptions){wizard._reset();}},complete:function(xhr,textStatus){if(formOptionsComplete){formOptionsComplete(xhr,textStatus);}\n
wizard._enableNavigation();},beforeSubmit:function(arr,theForm,options){if(formOptionsBeforeSubmit){var shouldSubmit=formOptionsBeforeSubmit(arr,theForm,options);if(!shouldSubmit)\n
......@@ -45,23 +42,23 @@ beforeSend(xhr);$(wizard.element).trigger(\'before_remote_ajax\',{"currentStep":
complete(xhr,statusText);$(wizard.element).trigger(\'after_remote_ajax\',{"currentStep":wizard.currentStep});wizard._enableNavigation();}})\n
this.element.ajaxSubmit(options);return false;}}\n
return this._continueToNextStep();},_back:function(){if(this.activatedSteps.length>0){if(this.options.historyEnabled){this._updateHistory(this.activatedSteps[this.activatedSteps.length-2]);}else{this._show(this.activatedSteps[this.activatedSteps.length-2],true);}}\n
return false;},_continueToNextStep:function(){if(this.isLastStep){for(var i=0;i<this.activatedSteps.length;i++){this.steps.filter("[id=\'"+this.activatedSteps[i]+"\']").find(":input").not(".wizard-ignore").removeAttr("disabled");}\n
return false;},_continueToNextStep:function(){if(this.isLastStep){for(var i=0;i<this.activatedSteps.length;i++){this.steps.filter("#"+this.activatedSteps[i]).find(":input").not(".wizard-ignore").removeAttr("disabled");}\n
if(!this.options.formPluginEnabled){return true;}else{this._disableNavigation();this.element.ajaxSubmit(this.options.formOptions);return false;}}\n
var step=this._navigate(this.currentStep);if(step==this.currentStep){return false;}\n
if(this.options.historyEnabled){this._updateHistory(step);}else{this._show(step,true);}\n
return false;},_updateHistory:function(step){var state={};state["_"+$(this.element).attr(\'id\')]=step;$.bbq.pushState(state);},_disableNavigation:function(){this.nextButton.attr("disabled","disabled");this.backButton.attr("disabled","disabled");if(!this.options.disableUIStyles){this.nextButton.removeClass("ui-state-active").addClass("ui-state-disabled");this.backButton.removeClass("ui-state-active").addClass("ui-state-disabled");}},_enableNavigation:function(){if(this.isLastStep){this.nextButton.val(this.options.textSubmit);}else{this.nextButton.val(this.options.textNext);}\n
if($.trim(this.currentStep)!==this.steps.eq(0).attr("id")){this.backButton.removeAttr("disabled");if(!this.options.disableUIStyles){this.backButton.removeClass("ui-state-disabled").addClass("ui-state-active");}}\n
this.nextButton.removeAttr("disabled");if(!this.options.disableUIStyles){this.nextButton.removeClass("ui-state-disabled").addClass("ui-state-active");}},_animate:function(oldStep,newStep,stepShownCallback){this._disableNavigation();var old=this.steps.filter("[id=\'"+oldStep+"\']");var current=this.steps.filter("[id=\'"+newStep+"\']");old.find(":input").not(".wizard-ignore").attr("disabled","disabled");current.find(":input").not(".wizard-ignore").removeAttr("disabled");var wizard=this;old.animate(wizard.options.outAnimation,wizard.options.outDuration,wizard.options.easing,function(){current.animate(wizard.options.inAnimation,wizard.options.inDuration,wizard.options.easing,function(){if(wizard.options.focusFirstInput)\n
current.find(":input:first").focus();wizard._enableNavigation();stepShownCallback.apply(wizard);});return;});},_checkIflastStep:function(step){this.isLastStep=false;if($("[id=\'"+step+"\']").hasClass(this.options.submitStepClass)||this.steps.filter(":last").attr("id")==step){this.isLastStep=true;}},_getLink:function(step){var link=undefined;var links=this.steps.filter("[id=\'"+step+"\']").find(this.options.linkClass);if(links!=undefined){if(links.filter(":radio,:checkbox").size()>0){link=links.filter(this.options.linkClass+":checked").val();}else{link=$(links).val();}}\n
return link;},_navigate:function(step){var link=this._getLink(step);if(link!=undefined){if((link!=""&&link!=null&&link!=undefined)&&this.steps.filter("[id=\'"+link+"\']").attr("id")!=undefined){return link;}\n
return this.currentStep;}else if(link==undefined&&!this.isLastStep){var step1=this.steps.filter("[id=\'"+step+"\']").next().attr("id");return step1;}},_show:function(step){var backwards=false;var triggerStepShown=step!==undefined;if(step==undefined||step==""){this.activatedSteps.pop();step=this.firstStep;this.activatedSteps.push(step);}else{if($.inArray(step,this.activatedSteps)>-1){backwards=true;this.activatedSteps.pop();}else{this.activatedSteps.push(step);}}\n
this.nextButton.removeAttr("disabled");if(!this.options.disableUIStyles){this.nextButton.removeClass("ui-state-disabled").addClass("ui-state-active");}},_animate:function(oldStep,newStep,stepShownCallback){this._disableNavigation();var old=this.steps.filter("#"+oldStep);var current=this.steps.filter("#"+newStep);old.find(":input").not(".wizard-ignore").attr("disabled","disabled");current.find(":input").not(".wizard-ignore").removeAttr("disabled");var wizard=this;old.animate(wizard.options.outAnimation,wizard.options.outDuration,wizard.options.easing,function(){current.animate(wizard.options.inAnimation,wizard.options.inDuration,wizard.options.easing,function(){if(wizard.options.focusFirstInput)\n
current.find(":input:first").focus();wizard._enableNavigation();stepShownCallback.apply(wizard);});return;});},_checkIflastStep:function(step){this.isLastStep=false;if($("#"+step).hasClass(this.options.submitStepClass)||this.steps.filter(":last").attr("id")==step){this.isLastStep=true;}},_getLink:function(step){var link=undefined;var links=this.steps.filter("#"+step).find(this.options.linkClass);if(links!=undefined){if(links.filter(":radio,:checkbox").size()>0){link=links.filter(this.options.linkClass+":checked").val();}else{link=$(links).val();}}\n
return link;},_navigate:function(step){var link=this._getLink(step);if(link!=undefined){if((link!=""&&link!=null&&link!=undefined)&&this.steps.filter("#"+link).attr("id")!=undefined){return link;}\n
return this.currentStep;}else if(link==undefined&&!this.isLastStep){var step1=this.steps.filter("#"+step).next().attr("id");return step1;}},_show:function(step){var backwards=false;var triggerStepShown=step!==undefined;if(step==undefined||step==""){this.activatedSteps.pop();step=this.firstStep;this.activatedSteps.push(step);}else{if($.inArray(step,this.activatedSteps)>-1){backwards=true;this.activatedSteps.pop();}else{this.activatedSteps.push(step);}}\n
if(this.currentStep!==step||step===this.firstStep){this.previousStep=this.currentStep;this._checkIflastStep(step);this.currentStep=step;var stepShownCallback=function(){if(triggerStepShown){$(this.element).trigger(\'step_shown\',$.extend({"isBackNavigation":backwards},this._state()));}}\n
if(triggerStepShown){$(this.element).trigger(\'before_step_shown\',$.extend({"isBackNavigation":backwards},this._state()));}\n
this._animate(this.previousStep,step,stepShownCallback);};},_reset:function(){this.element.resetForm()\n
$("label,:input,textarea",this).removeClass("error");for(var i=0;i<this.activatedSteps.length;i++){this.steps.filter("[id=\'"+this.activatedSteps[i]+"\']").hide().find(":input").attr("disabled","disabled");}\n
$("label,:input,textarea",this).removeClass("error");for(var i=0;i<this.activatedSteps.length;i++){this.steps.filter("#"+this.activatedSteps[i]).hide().find(":input").attr("disabled","disabled");}\n
this.activatedSteps=new Array();this.previousStep=undefined;this.isLastStep=false;if(this.options.historyEnabled){this._updateHistory(this.firstStep);}else{this._show(this.firstStep);}},_state:function(state){var currentState={"settings":this.options,"activatedSteps":this.activatedSteps,"isLastStep":this.isLastStep,"isFirstStep":this.currentStep===this.firstStep,"previousStep":this.previousStep,"currentStep":this.currentStep,"backButton":this.backButton,"nextButton":this.nextButton,"steps":this.steps,"firstStep":this.firstStep}\n
if(state!==undefined)\n
return currentState[state];return currentState;},show:function(step){if(this.options.historyEnabled){this._updateHistory(step);}else{this._show(step);}},state:function(state){return this._state(state);},reset:function(){this._reset();},next:function(){this._next();},back:function(){this._back();},destroy:function(){this.element.find("*").removeAttr("disabled").show();this.nextButton.unbind("click").val(this.nextButtonInitinalValue).removeClass("ui-state-disabled").addClass("ui-state-active");this.backButton.unbind("click").val(this.backButtonInitinalValue).removeClass("ui-state-disabled").addClass("ui-state-active");this.backButtonInitinalValue=undefined;this.nextButtonInitinalValue=undefined;this.activatedSteps=undefined;this.previousStep=undefined;this.currentStep=undefined;this.isLastStep=undefined;this.options=undefined;this.nextButton=undefined;this.backButton=undefined;this.formwizard=undefined;this.element=undefined;this.steps=undefined;this.firstStep=undefined;},update_steps:function(){this.steps=this.element.find(".step").addClass("ui-formwizard-content");this.firstStep=this.steps.eq(0).attr("id");this.steps.not("[id=\'"+this.currentStep+"\']").hide().find(":input").addClass("ui-wizard-content").attr("disabled","disabled");this._checkIflastStep(this.currentStep);this._enableNavigation();if(!this.options.disableUIStyles){this.steps.addClass("ui-helper-reset ui-corner-all");this.steps.find(":input").addClass("ui-helper-reset ui-state-default");}},options:{historyEnabled:false,validationEnabled:false,validationOptions:undefined,formPluginEnabled:false,linkClass:".link",submitStepClass:"submit_step",back:":reset",next:":submit",textSubmit:\'Submit\',textNext:\'Next\',textBack:\'Back\',remoteAjax:undefined,inAnimation:{opacity:\'show\'},outAnimation:{opacity:\'hide\'},inDuration:400,outDuration:400,easing:\'swing\',focusFirstInput:false,disableInputFields:true,formOptions:{reset:true,success:function(data){if((window[\'console\']!==undefined)){console.log("%s","form submit successful");}},disableUIStyles:false}}});})(jQuery);var is={ie:navigator.appName==\'Microsoft Internet Explorer\',java:navigator.javaEnabled(),ns:navigator.appName==\'Netscape\',ua:navigator.userAgent.toLowerCase(),version:parseFloat(navigator.appVersion.substr(21))||parseFloat(navigator.appVersion),win:navigator.platform==\'Win32\'}\n
return currentState[state];return currentState;},show:function(step){if(this.options.historyEnabled){this._updateHistory(step);}else{this._show(step);}},state:function(state){return this._state(state);},reset:function(){this._reset();},next:function(){this._next();},back:function(){this._back();},destroy:function(){this.element.find("*").removeAttr("disabled").show();this.nextButton.unbind("click").val(this.nextButtonInitinalValue).removeClass("ui-state-disabled").addClass("ui-state-active");this.backButton.unbind("click").val(this.backButtonInitinalValue).removeClass("ui-state-disabled").addClass("ui-state-active");this.backButtonInitinalValue=undefined;this.nextButtonInitinalValue=undefined;this.activatedSteps=undefined;this.previousStep=undefined;this.currentStep=undefined;this.isLastStep=undefined;this.options=undefined;this.nextButton=undefined;this.backButton=undefined;this.formwizard=undefined;this.element=undefined;this.steps=undefined;this.firstStep=undefined;},update_steps:function(){this.steps=this.element.find(".step").addClass("ui-formwizard-content");this.firstStep=this.steps.eq(0).attr("id");this.steps.not("#"+this.currentStep).hide().find(":input").addClass("ui-wizard-content").attr("disabled","disabled");this._checkIflastStep(this.currentStep);this._enableNavigation();if(!this.options.disableUIStyles){this.steps.addClass("ui-helper-reset ui-corner-all");this.steps.find(":input").addClass("ui-helper-reset ui-state-default");}},options:{historyEnabled:false,validationEnabled:false,validationOptions:undefined,formPluginEnabled:false,linkClass:".link",submitStepClass:"submit_step",back:":reset",next:":submit",textSubmit:\'Submit\',textNext:\'Next\',textBack:\'Back\',remoteAjax:undefined,inAnimation:{opacity:\'show\'},outAnimation:{opacity:\'hide\'},inDuration:400,outDuration:400,easing:\'swing\',focusFirstInput:false,disableInputFields:true,formOptions:{reset:true,success:function(data){if((window[\'console\']!==undefined)){console.log("%s","form submit successful");}},disableUIStyles:false}}});})(jQuery);var is={ie:navigator.appName==\'Microsoft Internet Explorer\',java:navigator.javaEnabled(),ns:navigator.appName==\'Netscape\',ua:navigator.userAgent.toLowerCase(),version:parseFloat(navigator.appVersion.substr(21))||parseFloat(navigator.appVersion),win:navigator.platform==\'Win32\'}\n
is.mac=is.ua.indexOf(\'mac\')>=0;if(is.ua.indexOf(\'opera\')>=0){is.ie=is.ns=false;is.opera=true;}\n
if(is.ua.indexOf(\'gecko\')>=0){is.ie=is.ns=false;is.gecko=true;}
......@@ -73,7 +70,7 @@ if(is.ua.indexOf(\'gecko\')>=0){is.ie=is.ns=false;is.gecko=true;}
</item>
<item>
<key> <string>size</string> </key>
<value> <int>12187</int> </value>
<value> <int>12107</int> </value>
</item>
<item>
<key> <string>title</string> </key>
......
5
\ No newline at end of file
4
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment