-
Notifications
You must be signed in to change notification settings - Fork 30
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Refactor loadDynamicContent into slightly more digestable pieces #16
Open
kalenjordan
wants to merge
1
commit into
colinmollenhour:master
Choose a base branch
from
kalenjordan:kalen_javascriptRefactor
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Refactor loadDynamicContent into slightly more digestable pieces #16
kalenjordan
wants to merge
1
commit into
colinmollenhour:master
from
kalenjordan:kalen_javascriptRefactor
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is just a trivial refactor, more than anything to test the waters with javascript code style stuff before I get ready to do some actual work with the ajax injection method for the Local backend. I tried to break down some of the logic in the loadDynamicContent into slightly more digestable component methods, and also made a couple of minor spacing tweaks.
Oh and I should mention that I haven't tested this yet. Again the changes are pretty trivial and my IDE code inspection is green so I feel pretty good about it. Hopefully I'll be able to test this once I wire it up to the Local backend here in a bit. |
Okay I just tested this locally with a single dynamic block and it worked like a charm. I haven't configured any ignored blocks or anything yet. |
coresh
added a commit
to coresh/Cm_Diehard
that referenced
this pull request
Sep 1, 2015
To exclude Warning: Warning: include(): Filename cannot be empty in /magento/.modman/Cm_Diehard/Mage/Core/Block/Template.php on line 250 #0 /magento/.modman/Cm_Diehard/Mage/Core/Block/Template.php(250): mageCoreErrorHandler(2, 'include(): File...', '/var/www/lightt...', 250, Array) colinmollenhour#1 /magento/.modman/Cm_Diehard/Mage/Core/Block/Template.php(250): include() colinmollenhour#2 /magento/.modman/Cm_Diehard/Mage/Core/Block/Template.php(281): Mage_Core_Block_Template->fetchView('adminhtml/base/...') colinmollenhour#3 /magento/.modman/Cm_Diehard/Mage/Core/Block/Template.php(295): Mage_Core_Block_Template->renderView() colinmollenhour#4 /magento/app/code/core/Mage/Adminhtml/Block/Template.php(81): Mage_Core_Block_Template->_toHtml() colinmollenhour#5 /magento/.modman/Cm_Diehard/Mage/Core/Block/Abstract.php(936): Mage_Adminhtml_Block_Template->_toHtml() colinmollenhour#6 /magento/app/code/core/Mage/Core/Block/Text/List.php(43): Mage_Core_Block_Abstract->toHtml() colinmollenhour#7 /magento/.modman/Cm_Diehard/Mage/Core/Block/Abstract.php(936): Mage_Core_Block_Text_List->_toHtml() colinmollenhour#8 /magento/.modman/Cm_Diehard/Mage/Core/Block/Abstract.php(642): Mage_Core_Block_Abstract->toHtml() colinmollenhour#9 /magento/.modman/Cm_Diehard/Mage/Core/Block/Abstract.php(586): Mage_Core_Block_Abstract->_getChildHtml('content', true) colinmollenhour#10 /magento/app/design/adminhtml/default/default/template/page.phtml(67): Mage_Core_Block_Abstract->getChildHtml('content') colinmollenhour#11 /magento/.modman/Cm_Diehard/Mage/Core/Block/Template.php(250): include('/var/www/lightt...') colinmollenhour#12 /magento/.modman/Cm_Diehard/Mage/Core/Block/Template.php(281): Mage_Core_Block_Template->fetchView('adminhtml/defau...') colinmollenhour#13 /magento/.modman/Cm_Diehard/Mage/Core/Block/Template.php(295): Mage_Core_Block_Template->renderView() colinmollenhour#14 /magento/app/code/core/Mage/Adminhtml/Block/Template.php(81): Mage_Core_Block_Template->_toHtml() colinmollenhour#15 /magento/.modman/Cm_Diehard/Mage/Core/Block/Abstract.php(936): Mage_Adminhtml_Block_Template->_toHtml() colinmollenhour#16 /magento/app/code/core/Mage/Core/Model/Layout.php(556): Mage_Core_Block_Abstract->toHtml() colinmollenhour#17 /magento/app/code/core/Mage/Core/Controller/Varien/Action.php(390): Mage_Core_Model_Layout->getOutput() colinmollenhour#18 /magento/app/code/core/Mage/Adminhtml/controllers/System/ConfigController.php(119): Mage_Core_Controller_Varien_Action->renderLayout() colinmollenhour#19 /magento/app/code/core/Mage/Core/Controller/Varien/Action.php(418): Mage_Adminhtml_System_ConfigController->editAction() colinmollenhour#20 /magento/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php(254): Mage_Core_Controller_Varien_Action->dispatch('edit') colinmollenhour#21 /magento/app/code/core/Mage/Core/Controller/Varien/Front.php(172): Mage_Core_Controller_Varien_Router_Standard->match(Object(Mage_Core_Controller_Request_Http)) colinmollenhour#22 /magento/app/code/core/Mage/Core/Model/App.php(365): Mage_Core_Controller_Varien_Front->dispatch() colinmollenhour#23 /magento/app/Mage.php(683): Mage_Core_Model_App->run(Array) colinmollenhour#24 /magento/pub/index.php(366): Mage::run('default', 'store') colinmollenhour#25 {main}
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is just a trivial refactor, more than anything to test the
waters with javascript code style stuff before I get ready to
do some actual work with the ajax injection method for the
Local backend.
I tried to break down some of the logic in the loadDynamicContent
into slightly more digestable component methods, and also made
a couple of minor spacing tweaks.2