小编Man*_*olo的帖子

我在远程存储库中有一个项目,与本地存储库(开发)和服务器(prod)同步.我一直在做一些已经推送到远程的提交更改并从服务器中提取.现在,我想撤消这些更改.所以我可以git checkout在更改之前提交并提交新的更改,但我猜测将它们再次推送到远程会有问题.有关如何进行的任何建议？

这有什么问题？

HTML:

<form action="http://localhost:8888/bevbros/index.php/test" method="post" accept-charset="utf-8" id="cpa-form" class="forms">        
      <input type="text" name="zip" value="Zip code" id="Zip" class="required valid">      
      <input type="submit" name="Next" value="Submit" class="forms" id="1">
  </form>

jQuery的:

$("#cpa-form").submit(function(e){
    e.preventDefault();
  });

这个问题类似于这一个,但更具体.

我有一个有两个分支(staging和beta)的项目.

我开发staging,并使用master分支来修复错误.因此,如果我正在进行暂存并且看到错误,我将更改为master分支:

git checkout master

做的事情:

git add fileToAdd
git commit -m "bug fixed"

然后我合并两个分支:

git checkout staging
git merge master
git checkout beta
git merge beta

如果工作树上有其他文件也没关系.

但是现在,当我尝试更改master分支时,我收到一个错误:

error: Your local changes to the following files would be overwritten by checkout:
src/Pro/ConvocationBundle/Controller/DefaultController.php
Please, commit your changes or stash them before you can switch branches.
Aborting

我以为我应该从暂存区域中删除该文件:

git reset HEAD src/Pro/ConvocationBundle/Controller/DefaultController.php

但是我得到了同样的错误.如果git …

我有这个代码的.gitignore文件:

/app/cache/*
/app/logs/*
/app/bootstrap*
/vendor/*
/web/bundles/
/app/config/parameters.yml

但是当我这样做时:

$ git status

在任何情况下(在添加和提交之前和之后),我得到一个像这样的长文本输出:

    ...

    #   deleted:    vendor/doctrine/orm/tools/sandbox/cli-config.php
    #   deleted:    vendor/doctrine/orm/tools/sandbox/doctrine
    #   deleted:    vendor/doctrine/orm/tools/sandbox/doctrine.php
    #   deleted:    vendor/doctrine/orm/tools/sandbox/index.php
    #   deleted:    vendor/doctrine/orm/tools/sandbox/xml/Entities.Address.dcm.xml
    #   deleted:    vendor/doctrine/orm/tools/sandbox/xml/Entities.User.dcm.xml
    #   deleted:    vendor/doctrine/orm/tools/sandbox/yaml/Entities.Address.dcm.yml
    #   deleted:    vendor/doctrine/orm/tools/sandbox/yaml/Entities.User.dcm.yml
    #   modified:   vendor/friendsofsymfony/user-bundle/FOS/UserBundle
    #   modified:   vendor/gedmo/doctrine-extensions
    #   modified:   vendor/herzult/forum-bundle/Herzult/Bundle/ForumBundle
    #   modified:   vendor/kriswallsmith/assetic
    #   modified:   vendor/symfony/property-access/Symfony/Component/PropertyAccess/.gitignore
    #   modified:   vendor/symfony/property-access/Symfony/Component/PropertyAccess/StringUtil.php
    #   modified:   vendor/symfony/symfony/CHANGELOG-2.1.md

    ...

供应商目录位于.gitignore文件中,因此我不知道发生了什么.我尝试过:

$ sudo git clean -dxf

但没有变化.

您是否知道如何将占位符属性设置为在safari中垂直居中？虽然当您开始输入时,文本完全居中.

PageSpeed Insights建议我:

"在首页内容中消除外部渲染阻止Javascript和CSS.您的页面有1个阻止CSS资源.这会导致渲染页面延迟.优化以下资源的CSS交付:http: //itransformer.es/ css/c0f9425.css "

css文件c0f9425.css是包含jquery-ui.css文件和自定义文件的组合文件.

我真的不明白这一点.我该如何遵循这个建议？

我的网站在Firefox和Chrome中都返回了一些奇怪的警告信息和错误.

Firefox返回以下错误:

GET http://fonts.googleapis.com/css?family=Varela+Round 200 OK 7c8e43d.js (line 18)
13:27:41.46 CSI/tbsd_
13:27:41.48 CSI/_tbnd

Chrome会返回此错误:

XMLHttpRequest cannot load http://fonts.googleapis.com/css?family=Varela+Round. No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin is therefore not allowed access. 

我猜这个问题与谷歌字体API有关,Access-Control-Allow-Origin我该如何解决这个错误呢？

如何根据某些ajax调用的结果控制移动到下一步？data.d以bool值返回

$("#wizard").steps({
            onStepChanging: function (event, currentIndex, newIndex) {
                var move = false;
                if (currentIndex == 2) {
                    move = false;
                    $.ajax({
                        type: 'POST',
                        url: "Reservation.aspx/SomeFunction",
                        data: serializeData({  }),
                        contentType: "application/json",
                        dataType: 'json',
                        success: function (data) {
                            move = data.d;
                            return true;
                        },
                        error: ajaxLoadError
                    });
                }
                return move;
            },
            saveState: true

        });

我正在开发一个现有的Web应用程序.我收到一些只为一个已知用户触发的前端错误.日志说:

[2014-05-19 18:40:05] frontend.ERROR:ReferenceError:找不到变量:dataKeys {"file":"undefined","line":"13","browser":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3)AppleWebKit/537.76.4(KHTML,类似Gecko)Version/7.0.4 Safari/537.76.4","page":"aPageFromTheSite"} []

此错误是从站点上的不同页面触发的.

我试图搜索变量dataKeys:

grep -r "dataKeys" ./

但没有找到结果.我想知道它来自哪里,因为我无法重现错误.我也"谷歌搜索",但没有找到相关的结果.知道它可能是什么原因？

我一直在尝试调用Entity Manager构造函数:

function __construct()
{
    $this->getDoctrine()->getEntityManager();
    ...

但是,正如我在这个答案中看到的:Stackoverflow问题,它无法完成.

所以我想知道是否有办法实现它,因为我必须经常调用它,并希望在获取存储库后在构造函数中做一些事情.

编辑:

我试过@MKhalidJunaid回答:

//src/MSD/HomeBundle/Resources/config/services.yml
services:
  imageTransController.custom.service:
    class:  MSD\HomeBundle\Controller\ImageTransController
    arguments: 
        EntityManager: "@doctrine.orm.entity_manager"

-

//app/config/config.php
imports:
- { resource: parameters.yml }
- { resource: security.yml }
- { resource: doctrine_extensions.yml }
- { resource: "@MSDHomeBundle/Resources/config/services.yml" }

-

//src/MSD/HomeBundle/Controller/ImageTransController.php
namespace MSD\HomeBundle\Controller;

use Doctrine\ORM\EntityManager;
use MSD\HomeBundle\Entity\Imagen as Imagen;
use MSD\HomeBundle\Controller\HomeController as HomeController;


class ImageTransController extends HomeController
{
    protected $em ;

    function __construct(EntityManager $entityManager)
    {
    ...

但我收到这个错误:

Catchable Fatal Error: Catchable Fatal Error: …